Add an API to install extra data (fd52bbe8) · Commits · Public Repositories / Rust Openssl

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,3 +2,4 @@ target/
		Cargo.lock
		.idea/
		*.iml
		.vscode/

openssl/src/ex_data.rs

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		use libc::c_int;
		use std::marker::PhantomData;

		/// A slot in a type's "extra data" structure.
		///
		/// It is parameterized over the type containing the extra data as well as the
		/// type of the data in the slot.
		pub struct Index<T, U>(c_int, PhantomData<(T, U)>);

		impl<T, U> Copy for Index<T, U> {}

		impl<T, U> Clone for Index<T, U> {
		fn clone(&self) -> Index<T, U> {
		*self
		}
		}

		impl<T, U> Index<T, U> {
		pub unsafe fn from_raw(idx: c_int) -> Index<T, U> {
		Index(idx, PhantomData)
		}

		pub fn as_raw(&self) -> c_int {
		self.0
		}
		}

openssl/src/lib.rs

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ pub mod dsa;
		pub mod ec;
		pub mod ec_key;
		pub mod error;
		pub mod ex_data;
		pub mod hash;
		pub mod memcmp;
		pub mod nid;

openssl/src/ssl/mod.rs

+78 −8

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ use std::slice;
		use std::str;
		use std::sync::Mutex;

		use {init, cvt, cvt_p};
		use {init, cvt, cvt_p, cvt_n};
		use dh::{Dh, DhRef};
		use ec::EcKeyRef;
		#[cfg(any(all(feature = "v101", ossl101), all(feature = "v102", ossl102)))]
		@@ -106,8 +106,15 @@ use x509::store::X509Store;
		use verify::X509VerifyParamRef;
		use pkey::PKeyRef;
		use error::ErrorStack;
		use ex_data::Index;
		use util::Opaque;
		use stack::{Stack, StackRef};
		use ssl::bio::BioMethod;
		use ssl::callbacks::*;

		pub use ssl::connector::{SslConnectorBuilder, SslConnector, SslAcceptorBuilder, SslAcceptor,
		ConnectConfiguration};
		pub use ssl::error::{Error, HandshakeError};

		mod error;
		mod callbacks;
		@@ -116,13 +123,6 @@ mod bio;
		#[cfg(test)]
		mod tests;

		use ssl::bio::BioMethod;
		use ssl::callbacks::*;

		pub use ssl::connector::{SslConnectorBuilder, SslConnector, SslAcceptorBuilder, SslAcceptor,
		ConnectConfiguration};
		pub use ssl::error::{Error, HandshakeError};

		// FIXME drop SSL_ prefix
		// FIXME remvove flags not used in OpenSSL 1.1
		bitflags! {
		@@ -741,6 +741,14 @@ impl SslContextBuilder {
		}
		}

		/// Sets the extra data at the specified index.
		pub fn set_ex_data<T>(&mut self, index: Index<SslContext, T>, data: T) {
		unsafe {
		let data = Box::new(data);
		ffi::SSL_CTX_set_ex_data(self.as_ptr(), index.as_raw(), Box::into_raw(data) as *mut c_void);
		}
		}

		pub fn build(self) -> SslContext {
		let ctx = SslContext(self.0);
		mem::forget(self);
		@@ -779,6 +787,20 @@ impl SslContext {
		pub fn builder(method: SslMethod) -> Result<SslContextBuilder, ErrorStack> {
		SslContextBuilder::new(method)
		}

		/// Returns a new extra data index.
		///
		/// Each invocation of this function is guaranteed to return a distinct
		/// index.
		pub fn new_ex_index<T>() -> Result<Index<SslContext, T>, ErrorStack>
		where
		T: 'static + Sync + Send
		{
		unsafe {
		let idx = try!(cvt_n(compat::get_new_idx(free_data_box::<T>)));
		Ok(Index::from_raw(idx))
		}
		}
		}

		impl SslContextRef {
		@@ -825,6 +847,18 @@ impl SslContextRef {
		StackRef::from_ptr(chain)
		}
		}

		/// Returns a reference to the extra data at the specified index.
		pub fn ex_data<T>(&self, index: Index<SslContext, T>) -> Option<&T> {
		unsafe {
		let data = ffi::SSL_CTX_get_ex_data(self.as_ptr(), index.as_raw());
		if data.is_null() {
		None
		} else {
		Some(&(data as const T))
		}
		}
		}
		}

		pub struct CipherBits {
		@@ -981,6 +1015,22 @@ foreign_type! {
		pub struct SslRef;
		}

		impl Ssl {
		/// Returns a new extra data index.
		///
		/// Each invocation of this function is guaranteed to return a distinct
		/// index.
		pub fn new_ex_index<T>() -> Result<Index<Ssl, T>, ErrorStack>
		where
		T: 'static + Sync + Send
		{
		unsafe {
		let idx = try!(cvt_n(compat::get_new_ssl_idx(free_data_box::<T>)));
		Ok(Index::from_raw(idx))
		}
		}
		}

		impl fmt::Debug for SslRef {
		fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
		let mut builder = fmt.debug_struct("Ssl");
		@@ -1353,6 +1403,26 @@ impl SslRef {
		pub fn is_server(&self) -> bool {
		unsafe { compat::SSL_is_server(self.as_ptr()) != 0 }
		}

		/// Sets the extra data at the specified index.
		pub fn set_ex_data<T>(&mut self, index: Index<Ssl, T>, data: T) {
		unsafe {
		let data = Box::new(data);
		ffi::SSL_set_ex_data(self.as_ptr(), index.as_raw(), Box::into_raw(data) as *mut c_void);
		}
		}

		/// Returns a reference to the extra data at the specified index.
		pub fn ex_data<T>(&self, index: Index<Ssl, T>) -> Option<&T> {
		unsafe {
		let data = ffi::SSL_get_ex_data(self.as_ptr(), index.as_raw());
		if data.is_null() {
		None
		} else {
		Some(&(data as const T))
		}
		}
		}
		}

		unsafe impl Sync for Ssl {}

openssl/src/x509/mod.rs

+17 −3

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ use std::ptr;
		use std::slice;
		use std::str;

		use {cvt, cvt_p};
		use {cvt, cvt_p, cvt_n};
		use asn1::{Asn1StringRef, Asn1Time, Asn1TimeRef, Asn1BitStringRef, Asn1IntegerRef, Asn1ObjectRef};
		use bio::MemBioSlice;
		use bn::{BigNum, MSB_MAYBE_ZERO};
		@@ -25,6 +25,7 @@ use nid::{self, Nid};
		use pkey::{PKey, PKeyRef};
		use stack::{Stack, StackRef, Stackable};
		use string::OpensslString;
		use ssl::SslRef;

		#[cfg(ossl10x)]
		use ffi::{X509_set_notBefore, X509_set_notAfter, ASN1_STRING_data, X509_STORE_CTX_get_chain};
		@@ -95,6 +96,19 @@ impl X509StoreContextRef {
		Some(StackRef::from_ptr(chain))
		}
		}

		/// Returns a reference to the `Ssl` associated with this context.
		pub fn ssl(&self) -> Result<Option<&SslRef>, ErrorStack> {
		unsafe {
		let idx = try!(cvt_n(ffi::SSL_get_ex_data_X509_STORE_CTX_idx()));
		let ssl = ffi::X509_STORE_CTX_get_ex_data(self.as_ptr(), idx);
		if ssl.is_null() {
		Ok(None)
		} else {
		Ok(Some(SslRef::from_ptr(ssl as *mut ffi::SSL)))
		}
		}
		}
		}

		#[deprecated(since = "0.9.7", note = "use X509Builder and X509ReqBuilder instead")]