aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2017-07-04 18:19:17 -1000
committerGitHub <[email protected]>2017-07-04 18:19:17 -1000
commit279bffccf54484512a44dbf0d27d97846ff43fac (patch)
tree39d5866f8a10f334557982afae79d975e41fd283 /openssl-sys
parentMerge pull request #655 from ltratt/master (diff)
parentMake some changes for review comments (diff)
downloadrust-openssl-279bffccf54484512a44dbf0d27d97846ff43fac.tar.xz
rust-openssl-279bffccf54484512a44dbf0d27d97846ff43fac.zip
Merge pull request #641 from luser/psk
Expose PSK via a SslContextBuilder::set_psk_callback method
Diffstat (limited to 'openssl-sys')
-rw-r--r--openssl-sys/src/lib.rs9
1 files changed, 9 insertions, 0 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index ec96c4fb..00e1208b 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -2262,6 +2262,15 @@ extern "C" {
arg: *mut c_void)
-> c_int,
arg: *mut c_void);
+ #[cfg(not(osslconf = "OPENSSL_NO_PSK"))]
+ pub fn SSL_CTX_set_psk_client_callback(ssl: *mut SSL_CTX,
+ psk_client_cb: Option<extern "C" fn(*mut SSL,
+ *const c_char,
+ *mut c_char,
+ c_uint,
+ *mut c_uchar,
+ c_uint)
+ -> c_uint>);
pub fn SSL_select_next_proto(out: *mut *mut c_uchar,
outlen: *mut c_uchar,
inbuf: *const c_uchar,