aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl/mod.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-08-15 18:46:15 -0700
committerSteven Fackler <[email protected]>2016-08-15 18:46:15 -0700
commit0f428d190410263e4daa65b917c0e84707a9c0ef (patch)
tree4d6d5b8b77c7ca5755a3636786b8a36584fba92a /openssl/src/ssl/mod.rs
parentMerge branch 'release-v0.7.15-sys-v0.8.0' into release (diff)
parentRelease openssl-sys v0.7.16, openssl v0.8.1 (diff)
downloadrust-openssl-openssl-sys-v0.7.16.tar.xz
rust-openssl-openssl-sys-v0.7.16.zip
Merge branch 'release-sys-v0.7.16-v0.8.1' into releaseopenssl-v0.8.1openssl-sys-v0.7.16
Diffstat (limited to 'openssl/src/ssl/mod.rs')
-rw-r--r--openssl/src/ssl/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 82ee3127..64a2ccaf 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -662,7 +662,7 @@ impl Clone for SslContext {
/// Requires the `ssl_context_clone` feature.
fn clone(&self) -> Self {
unsafe {
- ::c_helpers::rust_SSL_CTX_clone(self.as_ptr());
+ ::c_helpers::rust_0_8_SSL_CTX_clone(self.as_ptr());
SslContext::from_ptr(self.as_ptr())
}
}
@@ -933,7 +933,7 @@ impl<'a> SslRef<'a> {
if ptr.is_null() {
None
} else {
- Some(X509::new(ptr))
+ Some(X509::from_ptr(ptr))
}
}
}