aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl/mod.rs
diff options
context:
space:
mode:
authorBenjamin Cheng <[email protected]>2018-06-02 13:47:52 -0400
committerBenjamin Cheng <[email protected]>2018-06-02 13:47:52 -0400
commit5d8a44612d8fb0c0f6b4e3046084d6b79a9f2065 (patch)
treed6c2e810c34eb42c0bb0d13e5896f4593155a5a8 /openssl/src/ssl/mod.rs
parentMerge remote-tracking branch 'origin/master' (diff)
downloadrust-openssl-5d8a44612d8fb0c0f6b4e3046084d6b79a9f2065.tar.xz
rust-openssl-5d8a44612d8fb0c0f6b4e3046084d6b79a9f2065.zip
add test for psk; deprecated set_psk_callback
Diffstat (limited to 'openssl/src/ssl/mod.rs')
-rw-r--r--openssl/src/ssl/mod.rs12
1 files changed, 12 insertions, 0 deletions
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index b69247db..dac23114 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -1240,6 +1240,18 @@ impl SslContextBuilder {
}
}
+ #[deprecated(since = "0.10.10", note = "renamed to `set_psk_client_callback`")]
+ #[cfg(not(osslconf = "OPENSSL_NO_PSK"))]
+ pub fn set_psk_callback<F>(&mut self, callback: F)
+ where
+ F: Fn(&mut SslRef, Option<&[u8]>, &mut [u8], &mut [u8]) -> Result<usize, ErrorStack>
+ + 'static
+ + Sync
+ + Send,
+ {
+ self.set_psk_client_callback(callback)
+ }
+
/// Sets the callback for providing an identity and pre-shared key for a TLS-PSK server.
///
/// The callback will be called with the SSL context, an identity provided by the client,