diff options
| author | Steven Fackler <[email protected]> | 2015-02-13 23:31:00 -0800 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-02-13 23:31:00 -0800 |
| commit | 2fa1571e2e7c3a9cb9e441e8c2e398c933072d21 (patch) | |
| tree | 52b551a30b002fdf844023f17a32f28a28af3922 | |
| parent | Move openssl license to openssl (diff) | |
| download | rust-openssl-2fa1571e2e7c3a9cb9e441e8c2e398c933072d21.tar.xz rust-openssl-2fa1571e2e7c3a9cb9e441e8c2e398c933072d21.zip | |
Remove deprecated functions from openssl-sys
| -rw-r--r-- | openssl-sys/src/lib.rs | 6 | ||||
| -rw-r--r-- | openssl/src/crypto/hmac.rs | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 5d4c4cb9..97dc047d 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -382,12 +382,6 @@ extern "C" { pub fn EVP_PKEY_set1_RSA(k: *mut EVP_PKEY, r: *mut RSA) -> c_int; pub fn HMAC_CTX_init(ctx: *mut HMAC_CTX); - #[deprecated = "use HMAC_Init_ex_shim instead"] - pub fn HMAC_Init_ex(ctx: *mut HMAC_CTX, key: *const u8, keylen: c_int, md: *const EVP_MD, imple: *const ENGINE) -> c_int; - #[deprecated = "use HMAC_Final_shim instead"] - pub fn HMAC_Final(ctx: *mut HMAC_CTX, output: *mut u8, len: *mut c_uint) -> c_int; - #[deprecated = "use HMAC_Update_shim instead"] - 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); pub fn HMAC_CTX_copy(dst: *mut HMAC_CTX, src: *const HMAC_CTX) -> c_int; diff --git a/openssl/src/crypto/hmac.rs b/openssl/src/crypto/hmac.rs index f3f5aee6..b7d5df54 100644 --- a/openssl/src/crypto/hmac.rs +++ b/openssl/src/crypto/hmac.rs @@ -176,7 +176,7 @@ impl Drop for HMAC { if self.state != Finalized { let mut buf: Vec<u8> = repeat(0).take(self.type_.md_len()).collect(); let mut len = 0; - ffi::HMAC_Final(&mut self.ctx, buf.as_mut_ptr(), &mut len); + ffi::HMAC_Final_shim(&mut self.ctx, buf.as_mut_ptr(), &mut len); } ffi::HMAC_CTX_cleanup(&mut self.ctx); } |