aboutsummaryrefslogtreecommitdiff
path: root/openssl/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-12-15 19:33:36 -0800
committerSteven Fackler <[email protected]>2015-12-15 19:33:36 -0800
commit3a0e64dca51f74f6cf1178f6a20949e4063ca9d6 (patch)
tree200086e6009e80742f4e0af8d4529215ead3c644 /openssl/src
parentMerge pull request #320 from uasi/add-variations-of-pbkdf2 (diff)
downloadrust-openssl-3a0e64dca51f74f6cf1178f6a20949e4063ca9d6.tar.xz
rust-openssl-3a0e64dca51f74f6cf1178f6a20949e4063ca9d6.zip
Cleanup
Diffstat (limited to 'openssl/src')
-rw-r--r--openssl/src/ssl/mod.rs10
1 files changed, 6 insertions, 4 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index dffcfdb8..6558e1a4 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -315,7 +315,7 @@ extern fn raw_verify_with_data<T>(preverify_ok: c_int,
}
}
-extern fn raw_sni(ssl: *mut ffi::SSL, ad: &mut c_int, arg: *mut c_void)
+extern fn raw_sni(ssl: *mut ffi::SSL, ad: &mut c_int, _arg: *mut c_void)
-> c_int {
unsafe {
let ssl_ctx = ffi::SSL_get_SSL_CTX(ssl);
@@ -982,9 +982,11 @@ impl Ssl {
/// obtain the context corresponding to the current connection
pub fn get_ssl_context(&self) -> SslContext {
- let ssl_ctx = unsafe { ffi::SSL_get_SSL_CTX(self.ssl) };
- let count = unsafe { ffi_extras::SSL_CTX_increment_refcount(ssl_ctx) };
- SslContext { ctx: ssl_ctx }
+ unsafe {
+ let ssl_ctx = ffi::SSL_get_SSL_CTX(self.ssl);
+ ffi_extras::SSL_CTX_increment_refcount(ssl_ctx);
+ SslContext { ctx: ssl_ctx }
+ }
}
}