aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/dh
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-08-10 21:07:41 -0700
committerSteven Fackler <[email protected]>2016-08-10 21:07:41 -0700
commit5e6b8e68fdcc94c6d7a931925bb32b145caeb3db (patch)
treecc7175eb0d2b30b7f7c7279711fab64424587c5a /openssl/src/dh
parentAsn1 and Bignum renames (diff)
downloadrust-openssl-5e6b8e68fdcc94c6d7a931925bb32b145caeb3db.tar.xz
rust-openssl-5e6b8e68fdcc94c6d7a931925bb32b145caeb3db.zip
More API cleanup
Diffstat (limited to 'openssl/src/dh')
-rw-r--r--openssl/src/dh/mod.rs9
1 files changed, 6 insertions, 3 deletions
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<DH, ErrorStack> {
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())
}
}
}