aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl/callbacks.rs
diff options
context:
space:
mode:
authorBenjamin Cheng <[email protected]>2018-05-16 17:49:36 -0400
committerBenjamin Cheng <[email protected]>2018-05-16 17:49:36 -0400
commit47a68e2929277889c466288333385bd367238a42 (patch)
treec7e00c6294af4f25907bd6e60879b32e2beceedd /openssl/src/ssl/callbacks.rs
parentMerge pull request #919 from sfackler/cleanup (diff)
downloadrust-openssl-47a68e2929277889c466288333385bd367238a42.tar.xz
rust-openssl-47a68e2929277889c466288333385bd367238a42.zip
Add wrapper for SSL_CTX_set_psk_server_callback
Diffstat (limited to 'openssl/src/ssl/callbacks.rs')
-rw-r--r--openssl/src/ssl/callbacks.rs36
1 files changed, 35 insertions, 1 deletions
diff --git a/openssl/src/ssl/callbacks.rs b/openssl/src/ssl/callbacks.rs
index fd5b7ef5..887d450c 100644
--- a/openssl/src/ssl/callbacks.rs
+++ b/openssl/src/ssl/callbacks.rs
@@ -48,7 +48,7 @@ where
}
#[cfg(not(osslconf = "OPENSSL_NO_PSK"))]
-pub extern "C" fn raw_psk<F>(
+pub extern "C" fn raw_client_psk<F>(
ssl: *mut ffi::SSL,
hint: *const c_char,
identity: *mut c_char,
@@ -84,6 +84,40 @@ where
}
}
+#[cfg(not(osslconf = "OPENSSL_NO_PSK"))]
+pub extern "C" fn raw_server_psk<F>(
+ ssl: *mut ffi::SSL,
+ identity: *const c_char,
+ psk: *mut c_uchar,
+ max_psk_len: c_uint,
+) -> c_uint
+where
+ F: Fn(&mut SslRef, Option<&[u8]>, &mut [u8]) -> Result<usize, ErrorStack>
+ + 'static
+ + Sync
+ + Send,
+{
+ unsafe {
+ let ssl = SslRef::from_ptr_mut(ssl);
+ let callback_idx = SslContext::cached_ex_index::<F>();
+
+ let callback = ssl.ssl_context()
+ .ex_data(callback_idx)
+ .expect("BUG: psk callback missing") as *const F;
+ let identity = if identity != ptr::null() {
+ Some(CStr::from_ptr(identity).to_bytes())
+ } else {
+ None
+ };
+ // Give the callback mutable slices into which it can write the psk.
+ let psk_sl = slice::from_raw_parts_mut(psk as *mut u8, max_psk_len as usize);
+ match (*callback)(ssl, identity, psk_sl) {
+ Ok(psk_len) => psk_len as u32,
+ _ => 0,
+ }
+ }
+}
+
pub extern "C" fn ssl_raw_verify<F>(
preverify_ok: c_int,
x509_ctx: *mut ffi::X509_STORE_CTX,