diff options
| author | Valerii Hiora <[email protected]> | 2014-09-30 09:39:21 +0300 |
|---|---|---|
| committer | Valerii Hiora <[email protected]> | 2014-09-30 09:39:21 +0300 |
| commit | a154ceeed22777b62b006e6cd11463a35e76abca (patch) | |
| tree | cbfcdf8a2c3297164ef29a854e6469441d96c064 /src | |
| parent | Fixed mut_null deprecation warnings (diff) | |
| download | rust-openssl-a154ceeed22777b62b006e6cd11463a35e76abca.tar.xz rust-openssl-a154ceeed22777b62b006e6cd11463a35e76abca.zip | |
Unification and explicity in FFI type decls
Diffstat (limited to 'src')
| -rw-r--r-- | src/crypto/symm.rs | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/ffi.rs | 32 |
2 files changed, 19 insertions, 19 deletions
diff --git a/src/crypto/symm.rs b/src/crypto/symm.rs index a3664bc0..a92f7753 100644 --- a/src/crypto/symm.rs +++ b/src/crypto/symm.rs @@ -22,7 +22,7 @@ pub enum Type { RC4_128, } -fn evpc(t: Type) -> (ffi::EVP_CIPHER, uint, uint) { +fn evpc(t: Type) -> (*const ffi::EVP_CIPHER, uint, uint) { unsafe { match t { AES_128_ECB => (ffi::EVP_aes_128_ecb(), 16u, 16u), @@ -42,8 +42,8 @@ fn evpc(t: Type) -> (ffi::EVP_CIPHER, uint, uint) { /// Represents a symmetric cipher context. pub struct Crypter { - evp: ffi::EVP_CIPHER, - ctx: ffi::EVP_CIPHER_CTX, + evp: *const ffi::EVP_CIPHER, + ctx: *mut ffi::EVP_CIPHER_CTX, keylen: uint, blocksize: uint } diff --git a/src/ffi.rs b/src/ffi.rs index 020948d1..5a8f753a 100755..100644 --- a/src/ffi.rs +++ b/src/ffi.rs @@ -7,16 +7,16 @@ pub type ASN1_STRING = c_void; pub type ASN1_TIME = c_void; pub type BIO = c_void; pub type BIO_METHOD = c_void; -pub type BN_CTX = *mut c_void; +pub type BN_CTX = c_void; pub type COMP_METHOD = c_void; pub type CRYPTO_EX_DATA = c_void; pub type ENGINE = c_void; -pub type EVP_CIPHER = *mut c_void; -pub type EVP_CIPHER_CTX = *mut c_void; +pub type EVP_CIPHER = c_void; +pub type EVP_CIPHER_CTX = c_void; pub type EVP_MD = c_void; -pub type EVP_PKEY = *mut c_void; +pub type EVP_PKEY = c_void; pub type EVP_PKEY_CTX = c_void; -pub type RSA = *mut c_void; +pub type RSA = c_void; pub type SSL = c_void; pub type SSL_CTX = c_void; pub type SSL_METHOD = c_void; @@ -276,25 +276,25 @@ extern "C" { pub fn EVP_sha384() -> *const EVP_MD; pub fn EVP_sha512() -> *const EVP_MD; - pub fn EVP_aes_128_cbc() -> EVP_CIPHER; - pub fn EVP_aes_128_ecb() -> EVP_CIPHER; + pub fn EVP_aes_128_cbc() -> *const EVP_CIPHER; + pub fn EVP_aes_128_ecb() -> *const EVP_CIPHER; // fn EVP_aes_128_ctr() -> EVP_CIPHER; // fn EVP_aes_128_gcm() -> EVP_CIPHER; - pub fn EVP_aes_256_cbc() -> EVP_CIPHER; - pub fn EVP_aes_256_ecb() -> EVP_CIPHER; + pub fn EVP_aes_256_cbc() -> *const EVP_CIPHER; + pub fn EVP_aes_256_ecb() -> *const EVP_CIPHER; // fn EVP_aes_256_ctr() -> EVP_CIPHER; // fn EVP_aes_256_gcm() -> EVP_CIPHER; - pub fn EVP_rc4() -> EVP_CIPHER; + pub fn EVP_rc4() -> *const EVP_CIPHER; - pub fn EVP_CIPHER_CTX_new() -> EVP_CIPHER_CTX; - pub fn EVP_CIPHER_CTX_set_padding(ctx: EVP_CIPHER_CTX, padding: c_int); - pub fn EVP_CIPHER_CTX_free(ctx: EVP_CIPHER_CTX); + 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_free(ctx: *mut EVP_CIPHER_CTX); - pub fn EVP_CipherInit(ctx: EVP_CIPHER_CTX, evp: EVP_CIPHER, + pub fn EVP_CipherInit(ctx: *mut EVP_CIPHER_CTX, evp: *const EVP_CIPHER, key: *const u8, iv: *const u8, mode: c_int); - pub fn EVP_CipherUpdate(ctx: EVP_CIPHER_CTX, outbuf: *mut u8, + 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: EVP_CIPHER_CTX, res: *mut u8, len: &mut c_int); + pub fn EVP_CipherFinal(ctx: *mut EVP_CIPHER_CTX, res: *mut u8, len: &mut c_int); pub fn EVP_DigestInit(ctx: *mut EVP_MD_CTX, typ: *const EVP_MD); pub fn EVP_DigestUpdate(ctx: *mut EVP_MD_CTX, data: *const u8, n: c_uint); |