From 5e6b8e68fdcc94c6d7a931925bb32b145caeb3db Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Wed, 10 Aug 2016 21:07:41 -0700 Subject: More API cleanup --- openssl/src/dh/mod.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'openssl/src/dh') diff --git a/openssl/src/dh/mod.rs b/openssl/src/dh/mod.rs index 0a37a5e2..1f4fd7fe 100644 --- a/openssl/src/dh/mod.rs +++ b/openssl/src/dh/mod.rs @@ -10,8 +10,11 @@ impl DH { #[cfg(feature = "dh_from_params")] pub fn from_params(p: BigNum, g: BigNum, q: BigNum) -> Result { let dh = unsafe { - try_ssl_null!(::c_helpers::rust_DH_new_from_params(p.into_raw(), g.into_raw(), q.into_raw())) + try_ssl_null!(::c_helpers::rust_DH_new_from_params(p.as_ptr(), g.as_ptr(), q.as_ptr())) }; + mem::forget(p); + mem::forget(g); + mem::forget(q); Ok(DH(dh)) } @@ -42,7 +45,7 @@ impl DH { Ok(DH(dh)) } - pub unsafe fn raw(&self) -> *mut ffi::DH { + pub unsafe fn as_ptr(&self) -> *mut ffi::DH { let DH(n) = *self; n } @@ -51,7 +54,7 @@ impl DH { impl Drop for DH { fn drop(&mut self) { unsafe { - ffi::DH_free(self.raw()) + ffi::DH_free(self.as_ptr()) } } } -- cgit v1.2.3