diff options
| author | Steven Fackler <[email protected]> | 2015-02-08 23:30:34 -0800 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-02-08 23:31:46 -0800 |
| commit | 6ef819f9718c3b43551461b72c531c2eeee878f9 (patch) | |
| tree | 4788a3c2a2ac6f425ab1b7317bc88bd1ebfc57d1 /openssl-sys/src/lib.rs | |
| parent | Merge pull request #156 from s-panferov/patch-1 (diff) | |
| download | rust-openssl-6ef819f9718c3b43551461b72c531c2eeee878f9.tar.xz rust-openssl-6ef819f9718c3b43551461b72c531c2eeee878f9.zip | |
Fix builds against 0.9.x OpenSSL
Namely builds on OSX
Diffstat (limited to 'openssl-sys/src/lib.rs')
| -rw-r--r-- | openssl-sys/src/lib.rs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 70526fd5..5d4c4cb9 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -382,12 +382,20 @@ 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; + // Pre-1.0 versions of these didn't return anything, so the shims bridge that gap + pub fn HMAC_Init_ex_shim(ctx: *mut HMAC_CTX, key: *const u8, keylen: c_int, md: *const EVP_MD, imple: *const ENGINE) -> c_int; + pub fn HMAC_Final_shim(ctx: *mut HMAC_CTX, output: *mut u8, len: *mut c_uint) -> c_int; + pub fn HMAC_Update_shim(ctx: *mut HMAC_CTX, input: *const u8, len: c_uint) -> c_int; + pub fn PEM_read_bio_X509(bio: *mut BIO, out: *mut *mut X509, callback: Option<PasswordCallback>, user_data: *mut c_void) -> *mut X509; |