diff options
| author | Frank Denis <[email protected]> | 2015-09-01 09:25:41 +0200 |
|---|---|---|
| committer | Frank Denis <[email protected]> | 2015-09-13 12:45:05 +0200 |
| commit | 6a2b4402e9f2e93008bd47470d88e12337edcfae (patch) | |
| tree | 88bf9db72ac0f1474797541074b792ae5c484a11 /openssl/src/dh | |
| parent | Merge pull request #270 from mvdnes/crypto_segv (diff) | |
| download | rust-openssl-6a2b4402e9f2e93008bd47470d88e12337edcfae.tar.xz rust-openssl-6a2b4402e9f2e93008bd47470d88e12337edcfae.zip | |
Use try_ssl_null!() when relevant
Diffstat (limited to 'openssl/src/dh')
| -rw-r--r-- | openssl/src/dh/mod.rs | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/openssl/src/dh/mod.rs b/openssl/src/dh/mod.rs index cbf9d3ab..64429fd8 100644 --- a/openssl/src/dh/mod.rs +++ b/openssl/src/dh/mod.rs @@ -8,10 +8,7 @@ pub struct DH(*mut ffi::DH); impl DH { pub fn from_params(p: BigNum, g: BigNum, q: BigNum) -> Result<DH, SslError> { - let dh = unsafe { ffi::DH_new_from_params(p.raw(), g.raw(), q.raw()) }; - if dh == ptr::null_mut() { - return Err(SslError::get()); - } + let dh = try_ssl_null!(unsafe { ffi::DH_new_from_params(p.raw(), g.raw(), q.raw()) }); mem::forget(p); mem::forget(g); mem::forget(q); @@ -20,28 +17,19 @@ impl DH { #[cfg(feature = "rfc5114")] pub fn get_1024_160() -> Result<DH, SslError> { - let dh = unsafe { ffi::DH_get_1024_160() }; - if dh == ptr::null_mut() { - return Err(SslError::get()); - } + let dh = try_ssl_null!(unsafe { ffi::DH_get_1024_160() }); Ok(DH(dh)) } #[cfg(feature = "rfc5114")] pub fn get_2048_224() -> Result<DH, SslError> { - let dh = unsafe { ffi::DH_get_2048_224() }; - if dh == ptr::null_mut() { - return Err(SslError::get()); - } + let dh = try_ssl_null!(unsafe { ffi::DH_get_2048_224() }); Ok(DH(dh)) } #[cfg(feature = "rfc5114")] pub fn get_2048_256() -> Result<DH, SslError> { - let dh = unsafe { ffi::DH_get_2048_256() }; - if dh == ptr::null_mut() { - return Err(SslError::get()); - } + let dh = try_ssl_null!(unsafe { ffi::DH_get_2048_256() }); Ok(DH(dh)) } |