aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-10-21 19:58:06 -0700
committerSteven Fackler <[email protected]>2016-10-21 19:58:06 -0700
commit02b4385c5d18534d7b02a3ebc3323b662251c36e (patch)
tree3947f443d58c2175f35a6e9cd6159365bc707bd9 /openssl/src/ssl
parentBorrowed servername (diff)
downloadrust-openssl-02b4385c5d18534d7b02a3ebc3323b662251c36e.tar.xz
rust-openssl-02b4385c5d18534d7b02a3ebc3323b662251c36e.zip
Convert X509VerifyParamRef
Diffstat (limited to 'openssl/src/ssl')
-rw-r--r--openssl/src/ssl/mod.rs4
-rw-r--r--openssl/src/ssl/tests/mod.rs8
2 files changed, 6 insertions, 6 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index d03b495f..26cafa9a 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -1010,9 +1010,9 @@ impl SslRef {
///
/// Requires the `v102` or `v110` features and OpenSSL 1.0.2 or 1.1.0.
#[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))]
- pub fn param<'a>(&'a mut self) -> X509VerifyParamRef<'a> {
+ pub fn param_mut(&mut self) -> &mut X509VerifyParamRef {
unsafe {
- X509VerifyParamRef::from_ptr(ffi::SSL_get0_param(self.as_ptr()))
+ X509VerifyParamRef::from_ptr_mut(ffi::SSL_get0_param(self.as_ptr()))
}
}
diff --git a/openssl/src/ssl/tests/mod.rs b/openssl/src/ssl/tests/mod.rs
index b255d01d..684f77ac 100644
--- a/openssl/src/ssl/tests/mod.rs
+++ b/openssl/src/ssl/tests/mod.rs
@@ -1053,8 +1053,8 @@ fn valid_hostname() {
ctx.set_verify(SSL_VERIFY_PEER);
let mut ssl = Ssl::new(&ctx).unwrap();
- ssl.param().set_hostflags(X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
- ssl.param().set_host("google.com").unwrap();
+ ssl.param_mut().set_hostflags(X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
+ ssl.param_mut().set_host("google.com").unwrap();
let s = TcpStream::connect("google.com:443").unwrap();
let mut socket = ssl.connect(s).unwrap();
@@ -1077,8 +1077,8 @@ fn invalid_hostname() {
ctx.set_verify(SSL_VERIFY_PEER);
let mut ssl = Ssl::new(&ctx).unwrap();
- ssl.param().set_hostflags(X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
- ssl.param().set_host("foobar.com").unwrap();
+ ssl.param_mut().set_hostflags(X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
+ ssl.param_mut().set_host("foobar.com").unwrap();
let s = TcpStream::connect("google.com:443").unwrap();
assert!(ssl.connect(s).is_err());