diff options
| author | Steven Fackler <[email protected]> | 2016-08-09 21:58:48 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-08-09 22:02:49 -0700 |
| commit | 0854632ff5c5c340e3300951dd06a767a16b11db (patch) | |
| tree | 14f59dd5701032070c1f17c3c5eab43d8e72a67e /openssl/src/x509 | |
| parent | Remove rust_SSL_clone (diff) | |
| download | rust-openssl-0854632ff5c5c340e3300951dd06a767a16b11db.tar.xz rust-openssl-0854632ff5c5c340e3300951dd06a767a16b11db.zip | |
Make c_helpers optional
Diffstat (limited to 'openssl/src/x509')
| -rw-r--r-- | openssl/src/x509/mod.rs | 8 | ||||
| -rw-r--r-- | openssl/src/x509/tests.rs | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs index 10537ea2..b7503e0a 100644 --- a/openssl/src/x509/mod.rs +++ b/openssl/src/x509/mod.rs @@ -473,14 +473,12 @@ impl Deref for X509 { } } -extern "C" { - fn rust_X509_clone(x509: *mut ffi::X509); -} - +#[cfg(feature = "x509_clone")] impl Clone for X509 { + /// Requires the `x509_clone` feature. fn clone(&self) -> X509 { unsafe { - rust_X509_clone(self.handle()); + ::c_helpers::rust_X509_clone(self.handle()); X509::new(self.handle()) } } diff --git a/openssl/src/x509/tests.rs b/openssl/src/x509/tests.rs index da1523af..ab480836 100644 --- a/openssl/src/x509/tests.rs +++ b/openssl/src/x509/tests.rs @@ -26,8 +26,7 @@ fn get_generator() -> X509Generator { fn pkey() -> PKey { let rsa = RSA::generate(2048).unwrap(); - let mut pkey = PKey::from_rsa(rsa).unwrap(); - pkey + PKey::from_rsa(rsa).unwrap() } #[test] |