Callback cleanup (c4459c37) · Commits · Public Repositories / Rust Openssl

openssl-sys/src/lib.rs

+12 −12

Original line number	Diff line number	Diff line
		@@ -78,17 +78,17 @@ pub type BN_ULONG = libc::c_ulonglong;
		#[cfg(target_pointer_width = "32")]
		pub type BN_ULONG = c_uint;

		pub type CRYPTO_EX_new = extern "C" fn(parent: mut c_void, ptr: mut c_void,
		pub type CRYPTO_EX_new = unsafe extern fn(parent: mut c_void, ptr: mut c_void,
		ad: *const CRYPTO_EX_DATA, idx: c_int,
		argl: c_long, argp: *const c_void) -> c_int;
		pub type CRYPTO_EX_dup = extern "C" fn(to: *mut CRYPTO_EX_DATA,
		pub type CRYPTO_EX_dup = unsafe extern fn(to: *mut CRYPTO_EX_DATA,
		from: mut CRYPTO_EX_DATA, from_d: mut c_void,
		idx: c_int, argl: c_long, argp: *mut c_void)
		-> c_int;
		pub type CRYPTO_EX_free = extern "C" fn(parent: mut c_void, ptr: mut c_void,
		pub type CRYPTO_EX_free = unsafe extern fn(parent: mut c_void, ptr: mut c_void,
		ad: *mut CRYPTO_EX_DATA, idx: c_int,
		argl: c_long, argp: *mut c_void);
		pub type PasswordCallback = extern "C" fn(buf: *mut c_char, size: c_int,
		pub type PasswordCallback = unsafe extern fn(buf: *mut c_char, size: c_int,
		rwflag: c_int, user_data: *mut c_void)
		-> c_int;

openssl/src/crypto/util.rs

+8 −8

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ impl<F> Drop for CallbackState<F> {
		/// Password callback function, passed to private key loading functions.
		///
		/// `cb_state` is expected to be a pointer to a `CallbackState`.
		pub extern "C" fn invoke_passwd_cb<F>(buf: *mut c_char,
		pub unsafe extern fn invoke_passwd_cb<F>(buf: *mut c_char,
		size: c_int,
		_rwflag: c_int,
		cb_state: *mut c_void)
		@@ -44,8 +44,8 @@ pub extern "C" fn invoke_passwd_cb<F>(buf: *mut c_char,
		where F: FnOnce(&mut [c_char]) -> usize {
		let result = panic::catch_unwind(\|\| {
		// build a `i8` slice to pass to the user callback
		let pass_slice = unsafe { slice::from_raw_parts_mut(buf, size as usize) };
		let callback = unsafe { &mut (cb_state as mut CallbackState<F>) };
		let pass_slice = slice::from_raw_parts_mut(buf, size as usize);
		let callback = &mut (cb_state as mut CallbackState<F>);

		callback.cb.take().unwrap()(pass_slice)
		});

openssl/src/ssl/mod.rs

+16 −27

Original line number	Diff line number	Diff line
		@@ -142,20 +142,20 @@ lazy_static! {
		static ref ALPN_PROTOS_IDX: c_int = get_new_idx::<Vec<u8>>();
		}

		/// Determine a new index to use for SSL CTX ex data.
		/// Registers a destruct for the data which will be called by openssl when the context is freed.
		fn get_new_idx<T>() -> c_int {
		extern fn free_data_box<T>(_parent: *mut c_void,
		unsafe extern fn free_data_box<T>(_parent: *mut c_void,
		ptr: *mut c_void,
		_ad: *mut ffi::CRYPTO_EX_DATA,
		_idx: c_int,
		_argl: c_long,
		_argp: *mut c_void) {
		if !ptr.is_null() {
		let _: Box<T> = unsafe { mem::transmute(ptr) };
		Box::<T>::from_raw(ptr as *mut T);
		}
		}

		/// Determine a new index to use for SSL CTX ex data.
		/// Registers a destruct for the data which will be called by openssl when the context is freed.
		fn get_new_idx<T>() -> c_int {
		unsafe {
		let idx = compat::get_new_idx(free_data_box::<T>);
		assert!(idx >= 0);
		@@ -164,17 +164,6 @@ fn get_new_idx<T>() -> c_int {
		}

		fn get_new_ssl_idx<T>() -> c_int {
		extern fn free_data_box<T>(_parent: *mut c_void,
		ptr: *mut c_void,
		_ad: *mut ffi::CRYPTO_EX_DATA,
		_idx: c_int,
		_argl: c_long,
		_argp: *mut c_void) {
		if !ptr.is_null() {
		let _: Box<T> = unsafe { mem::transmute(ptr) };
		}
		}

		unsafe {
		let idx = compat::get_new_ssl_idx(free_data_box::<T>);
		assert!(idx >= 0);
		@@ -190,7 +179,7 @@ extern fn raw_verify<F>(preverify_ok: c_int, x509_ctx: *mut ffi::X509_STORE_CTX)
		let ssl = ffi::X509_STORE_CTX_get_ex_data(x509_ctx, idx);
		let ssl_ctx = ffi::SSL_get_SSL_CTX(ssl as *const _);
		let verify = ffi::SSL_CTX_get_ex_data(ssl_ctx, get_verify_data_idx::<F>());
		let verify: &F = mem::transmute(verify);
		let verify: &F = &(verify as mut F);

		let ctx = X509StoreContext::new(x509_ctx);

		@@ -206,7 +195,7 @@ extern fn ssl_raw_verify<F>(preverify_ok: c_int, x509_ctx: *mut ffi::X509_STORE_
		let ssl = ffi::X509_STORE_CTX_get_ex_data(x509_ctx, idx);
		let verify = ffi::SSL_get_ex_data(ssl as *const _,
		get_ssl_verify_data_idx::<F>());
		let verify: &F = mem::transmute(verify);
		let verify: &F = &(verify as mut F);

		let ctx = X509StoreContext::new(x509_ctx);

		@@ -220,7 +209,7 @@ extern fn raw_sni<F>(ssl: mut ffi::SSL, al: mut c_int, _arg: *mut c_void) -> c
		unsafe {
		let ssl_ctx = ffi::SSL_get_SSL_CTX(ssl);
		let callback = ffi::SSL_CTX_get_ex_data(ssl_ctx, get_verify_data_idx::<F>());
		let callback: &F = mem::transmute(callback);
		let callback: &F = &(callback as mut F);
		let mut ssl = SslRef::from_ptr(ssl);

		match callback(&mut ssl) {
		@@ -250,7 +239,7 @@ unsafe fn select_proto_using(ssl: *mut ffi::SSL,
		// extra data.
		let ssl_ctx = ffi::SSL_get_SSL_CTX(ssl);
		let protocols = ffi::SSL_CTX_get_ex_data(ssl_ctx, ex_data);
		let protocols: &Vec<u8> = mem::transmute(protocols);
		let protocols: &Vec<u8> = &(protocols as mut Vec<u8>);
		// Prepare the client list parameters to be passed to the OpenSSL function...
		let client = protocols.as_ptr();
		let client_len = protocols.len() as c_uint;
		@@ -313,7 +302,7 @@ extern fn raw_next_protos_advertise_cb(ssl: *mut ffi::SSL,
		} else {
		// If the pointer is valid, put the pointer to the actual byte array into the
		// output parameter `out`, as well as its length into `outlen`.
		let protocols: &Vec<u8> = mem::transmute(protocols);
		let protocols: &Vec<u8> = &(protocols as mut Vec<u8>);
		*out = protocols.as_ptr();
		*outlen = protocols.len() as c_uint;
		}