diff options
| author | Steven Fackler <[email protected]> | 2015-11-17 20:40:46 -0800 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-11-17 20:40:46 -0800 |
| commit | ccd3a1cf07ec11767df8b9ddc4e0161439b0e04b (patch) | |
| tree | fcc183e68b243b708e18275053db579d92dd6cc2 | |
| parent | Remove unecessary build dependency (diff) | |
| parent | Fix a leak when using `EVP_PKEY_get1_RSA`. (diff) | |
| download | rust-openssl-ccd3a1cf07ec11767df8b9ddc4e0161439b0e04b.tar.xz rust-openssl-ccd3a1cf07ec11767df8b9ddc4e0161439b0e04b.zip | |
Merge pull request #306 from overminder/get1-leak-fix
Fix a leak when using `EVP_PKEY_get1_RSA`.
| -rw-r--r-- | openssl-sys/src/lib.rs | 1 | ||||
| -rw-r--r-- | openssl/src/crypto/pkey.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 018f8bca..239f8d9e 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -482,6 +482,7 @@ extern "C" { pub fn RAND_bytes(buf: *mut u8, num: c_int) -> c_int; + pub fn RSA_free(rsa: *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_generate_key_ex(rsa: *mut RSA, bits: c_int, e: *mut BIGNUM, cb: *const c_void) -> c_int; pub fn RSA_private_decrypt(flen: c_int, from: *const u8, to: *mut u8, k: *mut RSA, diff --git a/openssl/src/crypto/pkey.rs b/openssl/src/crypto/pkey.rs index 6ca0aa12..741c6749 100644 --- a/openssl/src/crypto/pkey.rs +++ b/openssl/src/crypto/pkey.rs @@ -120,6 +120,7 @@ impl PKey { let mut s = repeat(0u8).take(len as usize).collect::<Vec<_>>(); let r = f(rsa, &s.as_mut_ptr()); + ffi::RSA_free(rsa); s.truncate(r as usize); s |