aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys
diff options
context:
space:
mode:
authorTed Mielczarek <[email protected]>2017-06-02 08:20:03 -0400
committerTed Mielczarek <[email protected]>2017-06-02 08:20:03 -0400
commit4de58596d930559f90cb96a993415ebc0b0ce876 (patch)
tree8f5bba3eb0e92b9e8f6eee69326890de0761db59 /openssl-sys
parentExpose PSK via a SslContextBuilder::set_psk_callback method (diff)
downloadrust-openssl-4de58596d930559f90cb96a993415ebc0b0ce876.tar.xz
rust-openssl-4de58596d930559f90cb96a993415ebc0b0ce876.zip
Make some changes for review comments
Diffstat (limited to 'openssl-sys')
-rw-r--r--openssl-sys/src/lib.rs15
1 files changed, 8 insertions, 7 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index de04ed38..06d37dab 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -2252,14 +2252,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: extern "C" fn(*mut SSL,
- *const c_char,
- *mut c_char,
- c_uint,
- *mut c_uchar,
- c_uint)
- -> c_uint);
+ 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,