Commit cb0898df authored by Gleb Kozyrev's avatar Gleb Kozyrev
Browse files

Bring ffi definitions closer to the originals 

Add missing return types and fix imprecise type translations.
Repair the fallout in the openssl crate.
parent 1a60bccb

openssl-sys/src/lib.rs

+17 −17
Original line number Diff line number Diff line
@@ -354,34 +354,34 @@ extern "C" { 
    pub fn EVP_rc4() -> *const EVP_CIPHER;



    pub fn EVP_CIPHER_CTX_new() -> *mut EVP_CIPHER_CTX;

    pub fn EVP_CIPHER_CTX_set_padding(ctx: *mut EVP_CIPHER_CTX, padding: c_int);

    pub fn EVP_CIPHER_CTX_set_padding(ctx: *mut EVP_CIPHER_CTX, padding: c_int) -> c_int;

    pub fn EVP_CIPHER_CTX_free(ctx: *mut EVP_CIPHER_CTX);



    pub fn EVP_CipherInit(ctx: *mut EVP_CIPHER_CTX, evp: *const EVP_CIPHER,

                          key: *const u8, iv: *const u8, mode: c_int);

                          key: *const u8, iv: *const u8, mode: c_int) -> c_int;

    pub fn EVP_CipherUpdate(ctx: *mut EVP_CIPHER_CTX, outbuf: *mut u8,

                            outlen: &mut c_uint, inbuf: *const u8, inlen: c_int);

    pub fn EVP_CipherFinal(ctx: *mut EVP_CIPHER_CTX, res: *mut u8, len: &mut c_int);

                            outlen: &mut c_int, inbuf: *const u8, inlen: c_int) -> c_int;

    pub fn EVP_CipherFinal(ctx: *mut EVP_CIPHER_CTX, res: *mut u8, len: &mut c_int) -> c_int;



    pub fn EVP_DigestInit(ctx: *mut EVP_MD_CTX, typ: *const EVP_MD);

    pub fn EVP_DigestInit_ex(ctx: *mut EVP_MD_CTX, typ: *const EVP_MD, imple: *const ENGINE);

    pub fn EVP_DigestUpdate(ctx: *mut EVP_MD_CTX, data: *const u8, n: c_uint);

    pub fn EVP_DigestFinal(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32);

    pub fn EVP_DigestFinal_ex(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32);

    pub fn EVP_DigestInit(ctx: *mut EVP_MD_CTX, typ: *const EVP_MD) -> c_int;

    pub fn EVP_DigestInit_ex(ctx: *mut EVP_MD_CTX, typ: *const EVP_MD, imple: *const ENGINE) -> c_int;

    pub fn EVP_DigestUpdate(ctx: *mut EVP_MD_CTX, data: *const u8, n: c_uint) -> c_int;

    pub fn EVP_DigestFinal(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32) -> c_int;

    pub fn EVP_DigestFinal_ex(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32) -> c_int;



    pub fn EVP_MD_CTX_create() -> *mut EVP_MD_CTX;

    pub fn EVP_MD_CTX_destroy(ctx: *mut EVP_MD_CTX);



    pub fn EVP_PKEY_new() -> *mut EVP_PKEY;

    pub fn EVP_PKEY_free(k: *mut EVP_PKEY);

    pub fn EVP_PKEY_assign(pkey: *mut EVP_PKEY, typ: c_int, key: *const c_char) -> c_int;

    pub fn EVP_PKEY_assign(pkey: *mut EVP_PKEY, typ: c_int, key: *const c_void) -> c_int;

    pub fn EVP_PKEY_get1_RSA(k: *mut EVP_PKEY) -> *mut RSA;

    pub fn EVP_PKEY_set1_RSA(k: *mut EVP_PKEY, r: *mut RSA) -> c_int;



    pub fn HMAC_CTX_init(ctx: *mut HMAC_CTX);

    pub fn HMAC_Init_ex(ctx: *mut HMAC_CTX, key: *const u8, keylen: c_int, md: *const EVP_MD, imple: *const ENGINE);

    pub fn HMAC_Final(ctx: *mut HMAC_CTX, output: *mut u8, len: *mut c_uint);

    pub fn HMAC_Update(ctx: *mut HMAC_CTX, input: *const u8, len: c_uint);

    pub fn HMAC_Init_ex(ctx: *mut HMAC_CTX, key: *const u8, keylen: c_int, md: *const EVP_MD, imple: *const ENGINE) -> c_int;

    pub fn HMAC_Final(ctx: *mut HMAC_CTX, output: *mut u8, len: *mut c_uint) -> c_int;

    pub fn HMAC_Update(ctx: *mut HMAC_CTX, input: *const u8, len: c_uint) -> c_int;

    pub fn HMAC_CTX_cleanup(ctx: *mut HMAC_CTX);
@@ -401,14 +401,14 @@ extern "C" { 


    pub fn RAND_bytes(buf: *mut u8, num: c_int) -> c_int;



    pub fn RSA_generate_key(modsz: c_uint, e: c_uint, cb: *const u8, cbarg: *const u8) -> *mut RSA;

    pub fn RSA_private_decrypt(flen: c_uint, from: *const u8, to: *mut u8, k: *mut RSA,

    pub fn RSA_generate_key(modsz: c_int, e: c_ulong, cb: *const c_void, cbarg: *const c_void) -> *mut RSA;

    pub fn RSA_private_decrypt(flen: c_int, from: *const u8, to: *mut u8, k: *mut RSA,

                               pad: c_int) -> c_int;

    pub fn RSA_public_encrypt(flen: c_uint, from: *const u8, to: *mut u8, k: *mut RSA,

    pub fn RSA_public_encrypt(flen: c_int, from: *const u8, to: *mut u8, k: *mut RSA,

                              pad: c_int) -> c_int;

    pub fn RSA_sign(t: c_int, m: *const u8, mlen: c_uint, sig: *mut u8, siglen: *mut c_uint,

                    k: *mut RSA) -> c_int;

    pub fn RSA_size(k: *mut RSA) -> c_uint;

    pub fn RSA_size(k: *mut RSA) -> c_int;

    pub fn RSA_verify(t: c_int, m: *const u8, mlen: c_uint, sig: *const u8, siglen: c_uint,

                      k: *mut RSA) -> c_int;

src/crypto/hash.rs

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ impl Hasher { 
    /// Update this hasher with more input bytes

    pub fn update(&mut self, data: &[u8]) {

        unsafe {

            ffi::EVP_DigestUpdate(self.ctx.ptr, data.as_ptr(), data.len() as c_uint)

            ffi::EVP_DigestUpdate(self.ctx.ptr, data.as_ptr(), data.len() as c_uint);

        }

    }

src/crypto/hmac.rs

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ pub fn HMAC(ht: hash::HashType, key: &[u8]) -> HMAC { 
impl HMAC {

    pub fn update(&mut self, data: &[u8]) {

        unsafe {

            ffi::HMAC_Update(&mut self.ctx, data.as_ptr(), data.len() as c_uint)

            ffi::HMAC_Update(&mut self.ctx, data.as_ptr(), data.len() as c_uint);

        }

    }

src/crypto/pkey.rs

+8 −7
Original line number Diff line number Diff line 
use libc::{c_int, c_uint};

use libc::{c_int, c_uint, c_ulong};

use std::iter::repeat;

use std::mem;

use std::ptr;
@@ -92,8 +92,8 @@ impl PKey { 
    pub fn gen(&mut self, keysz: usize) {

        unsafe {

            let rsa = ffi::RSA_generate_key(

                keysz as c_uint,

                65537 as c_uint,

                keysz as c_int,

                65537 as c_ulong,

                ptr::null(),

                ptr::null()

            );
@@ -213,7 +213,7 @@ impl PKey { 
            let mut r = repeat(0u8).take(len as usize + 1).collect::<Vec<_>>();



            let rv = ffi::RSA_public_encrypt(

                s.len() as c_uint,

                s.len() as c_int,

                s.as_ptr(),

                r.as_mut_ptr(),

                rsa,
@@ -233,12 +233,12 @@ impl PKey { 
            let rsa = ffi::EVP_PKEY_get1_RSA(self.evp);

            let len = ffi::RSA_size(rsa);



            assert_eq!(s.len() as c_uint, ffi::RSA_size(rsa));

            assert_eq!(s.len() as c_int, ffi::RSA_size(rsa));



            let mut r = repeat(0u8).take(len as usize + 1).collect::<Vec<_>>();



            let rv = ffi::RSA_private_decrypt(

                s.len() as c_uint,

                s.len() as c_int,

                s.as_ptr(),

                r.as_mut_ptr(),

                rsa,
@@ -279,9 +279,10 @@ impl PKey { 
    pub fn sign_with_hash(&self, s: &[u8], hash: HashType) -> Vec<u8> {

        unsafe {

            let rsa = ffi::EVP_PKEY_get1_RSA(self.evp);

            let mut len = ffi::RSA_size(rsa);

            let len = ffi::RSA_size(rsa);

            let mut r = repeat(0u8).take(len as usize + 1).collect::<Vec<_>>();



            let mut len = 0;

            let rv = ffi::RSA_sign(

                openssl_hash_nid(hash),

                s.as_ptr(),

src/crypto/symm.rs

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ impl Crypter { 
                key.as_ptr(),

                iv.as_ptr(),

                mode

            )

            );

        }

    }
@@ -112,7 +112,7 @@ impl Crypter { 
        unsafe {

            let sum = data.len() + (self.blocksize as usize);

            let mut res = repeat(0u8).take(sum).collect::<Vec<_>>();

            let mut reslen = sum as u32;

            let mut reslen = sum as c_int;



            ffi::EVP_CipherUpdate(

                self.ctx,