Add wrapper for SSL_CTX_set_psk_server_callback (47a68e29) · Commits · Public Repositories / Rust Openssl

openssl-sys/src/lib.rs

+8 −0

Original line number	Diff line number	Diff line
		@@ -2576,6 +2576,14 @@ extern "C" {
		-> c_uint,
		>,
		);
		#[cfg(not(osslconf = "OPENSSL_NO_PSK"))]
		pub fn SSL_CTX_set_psk_server_callback(
		ssl: *mut SSL_CTX,
		psk_server_cb: Option<
		extern "C" fn(mut SSL, const c_char, *mut c_uchar, c_uint)
		-> c_uint,
		>,
		);

		pub fn SSL_select_next_proto(
		out: mut mut c_uchar,

openssl/src/ssl/callbacks.rs

+35 −1

Original line number	Diff line number	Diff line
		@@ -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,

openssl/src/ssl/mod.rs

+25 −2

Original line number	Diff line number	Diff line
		@@ -1226,7 +1226,7 @@ impl SslContextBuilder {
		///
		/// [`SSL_CTX_set_psk_client_callback`]: https://www.openssl.org/docs/man1.0.2/ssl/SSL_CTX_set_psk_client_callback.html
		#[cfg(not(osslconf = "OPENSSL_NO_PSK"))]
		pub fn set_psk_callback<F>(&mut self, callback: F)
		pub fn set_psk_client_callback<F>(&mut self, callback: F)
		where
		F: Fn(&mut SslRef, Option<&[u8]>, &mut [u8], &mut [u8]) -> Result<usize, ErrorStack>
		+ 'static
		@@ -1235,7 +1235,30 @@ impl SslContextBuilder {
		{
		unsafe {
		self.set_ex_data(SslContext::cached_ex_index::<F>(), callback);
		ffi::SSL_CTX_set_psk_client_callback(self.as_ptr(), Some(raw_psk::<F>));
		ffi::SSL_CTX_set_psk_client_callback(self.as_ptr(), Some(raw_client_psk::<F>));
		}
		}

		/// 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,
		/// and, a mutable slice for the pre-shared key bytes. The callback returns the number of
		/// bytes in the pre-shared key.
		///
		/// This corresponds to [`SSL_CTX_set_psk_server_callback`].
		///
		/// [`SSL_CTX_set_psk_server_callback`]: https://www.openssl.org/docs/man1.0.2/ssl/SSL_CTX_set_psk_server_callback.html
		#[cfg(not(osslconf = "OPENSSL_NO_PSK"))]
		pub fn set_psk_server_callback<F>(&mut self, callback: F)
		where
		F: Fn(&mut SslRef, Option<&[u8]>, &mut [u8]) -> Result<usize, ErrorStack>
		+ 'static
		+ Sync
		+ Send,
		{
		unsafe {
		self.set_ex_data(SslContext::cached_ex_index::<F>(), callback);
		ffi::SSL_CTX_set_psk_server_callback(self.as_ptr(), Some(raw_server_psk::<F>));
		}
		}

Admin message