get_handle -> handle (bc97d088) · Commits · Public Repositories / Rust Openssl

openssl/src/asn1/mod.rs

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ impl Asn1Time {
		}

		/// Returns raw handle
		pub unsafe fn get_handle(&self) -> *mut ffi::ASN1_TIME {
		pub unsafe fn handle(&self) -> *mut ffi::ASN1_TIME {
		return self.handle;
		}
		}

openssl/src/bio.rs

+2 −2

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ impl<'a> MemBioSlice<'a> {
		Ok(MemBioSlice(bio, PhantomData))
		}

		pub fn get_handle(&self) -> *mut ffi::BIO {
		pub fn handle(&self) -> *mut ffi::BIO {
		self.0
		}
		}
		@@ -53,7 +53,7 @@ impl MemBio {
		Ok(MemBio(bio))
		}

		pub fn get_handle(&self) -> *mut ffi::BIO {
		pub fn handle(&self) -> *mut ffi::BIO {
		self.0
		}

openssl/src/crypto/dsa.rs

+5 −5

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ impl DSA {
		let mem_bio = try!(MemBioSlice::new(buf));

		unsafe {
		let dsa = try_ssl_null!(ffi::PEM_read_bio_DSAPrivateKey(mem_bio.get_handle(),
		let dsa = try_ssl_null!(ffi::PEM_read_bio_DSAPrivateKey(mem_bio.handle(),
		ptr::null_mut(),
		None,
		ptr::null_mut()));
		@@ -97,7 +97,7 @@ impl DSA {

		unsafe {
		let cb_ptr = &mut cb as mut _ as mut c_void;
		let dsa = try_ssl_null!(ffi::PEM_read_bio_DSAPrivateKey(mem_bio.get_handle(),
		let dsa = try_ssl_null!(ffi::PEM_read_bio_DSAPrivateKey(mem_bio.handle(),
		ptr::null_mut(),
		Some(invoke_passwd_cb::<F>),
		cb_ptr));
		@@ -114,7 +114,7 @@ impl DSA {
		let mem_bio = try!(MemBio::new());

		unsafe {
		try_ssl!(ffi::PEM_write_bio_DSAPrivateKey(mem_bio.get_handle(), self.0,
		try_ssl!(ffi::PEM_write_bio_DSAPrivateKey(mem_bio.handle(), self.0,
		ptr::null(), ptr::null_mut(), 0,
		None, ptr::null_mut()))
		};
		@@ -129,7 +129,7 @@ impl DSA {

		let mem_bio = try!(MemBioSlice::new(buf));
		unsafe {
		let dsa = try_ssl_null!(ffi::PEM_read_bio_DSA_PUBKEY(mem_bio.get_handle(),
		let dsa = try_ssl_null!(ffi::PEM_read_bio_DSA_PUBKEY(mem_bio.handle(),
		ptr::null_mut(),
		None,
		ptr::null_mut()));
		@@ -140,7 +140,7 @@ impl DSA {
		/// Writes an DSA public key as PEM formatted data
		pub fn public_key_to_pem(&self) -> Result<Vec<u8>, ErrorStack> {
		let mem_bio = try!(MemBio::new());
		unsafe { try_ssl!(ffi::PEM_write_bio_DSA_PUBKEY(mem_bio.get_handle(), self.0)) };
		unsafe { try_ssl!(ffi::PEM_write_bio_DSA_PUBKEY(mem_bio.handle(), self.0)) };
		Ok(mem_bio.get_buf().to_owned())
		}

openssl/src/crypto/pkey.rs

+5 −5

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ impl PKey {
		pub fn private_key_from_pem(buf: &[u8]) -> Result<PKey, ErrorStack> {
		let mem_bio = try!(MemBioSlice::new(buf));
		unsafe {
		let evp = try_ssl_null!(ffi::PEM_read_bio_PrivateKey(mem_bio.get_handle(),
		let evp = try_ssl_null!(ffi::PEM_read_bio_PrivateKey(mem_bio.handle(),
		ptr::null_mut(),
		None,
		ptr::null_mut()));
		@@ -100,7 +100,7 @@ impl PKey {
		let mut cb = CallbackState::new(pass_cb);
		let mem_bio = try!(MemBioSlice::new(buf));
		unsafe {
		let evp = try_ssl_null!(ffi::PEM_read_bio_PrivateKey(mem_bio.get_handle(),
		let evp = try_ssl_null!(ffi::PEM_read_bio_PrivateKey(mem_bio.handle(),
		ptr::null_mut(),
		Some(invoke_passwd_cb::<F>),
		&mut cb as mut _ as mut c_void));
		@@ -116,7 +116,7 @@ impl PKey {
		pub fn public_key_from_pem(buf: &[u8]) -> Result<PKey, ErrorStack> {
		let mem_bio = try!(MemBioSlice::new(buf));
		unsafe {
		let evp = try_ssl_null!(ffi::PEM_read_bio_PUBKEY(mem_bio.get_handle(),
		let evp = try_ssl_null!(ffi::PEM_read_bio_PUBKEY(mem_bio.handle(),
		ptr::null_mut(),
		None,
		ptr::null_mut()));
		@@ -266,7 +266,7 @@ impl PKey {
		pub fn write_pem(&self) -> Result<Vec<u8>, ErrorStack> {
		let mem_bio = try!(MemBio::new());
		unsafe {
		try_ssl!(ffi::PEM_write_bio_PrivateKey(mem_bio.get_handle(),
		try_ssl!(ffi::PEM_write_bio_PrivateKey(mem_bio.handle(),
		self.evp,
		ptr::null(),
		ptr::null_mut(),
		@@ -281,7 +281,7 @@ impl PKey {
		/// Stores public key as a PEM
		pub fn write_pub_pem(&self) -> Result<Vec<u8>, ErrorStack> {
		let mem_bio = try!(MemBio::new());
		unsafe { try_ssl!(ffi::PEM_write_bio_PUBKEY(mem_bio.get_handle(), self.evp)) }
		unsafe { try_ssl!(ffi::PEM_write_bio_PUBKEY(mem_bio.handle(), self.evp)) }
		Ok(mem_bio.get_buf().to_owned())
		}

openssl/src/crypto/rsa.rs

+5 −5

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ impl RSA {
		pub fn private_key_from_pem(buf: &[u8]) -> Result<RSA, ErrorStack> {
		let mem_bio = try!(MemBioSlice::new(buf));
		unsafe {
		let rsa = try_ssl_null!(ffi::PEM_read_bio_RSAPrivateKey(mem_bio.get_handle(),
		let rsa = try_ssl_null!(ffi::PEM_read_bio_RSAPrivateKey(mem_bio.handle(),
		ptr::null_mut(),
		None,
		ptr::null_mut()));
		@@ -81,7 +81,7 @@ impl RSA {

		unsafe {
		let cb_ptr = &mut cb as mut _ as mut c_void;
		let rsa = try_ssl_null!(ffi::PEM_read_bio_RSAPrivateKey(mem_bio.get_handle(),
		let rsa = try_ssl_null!(ffi::PEM_read_bio_RSAPrivateKey(mem_bio.handle(),
		ptr::null_mut(),
		Some(invoke_passwd_cb::<F>),
		cb_ptr));
		@@ -95,7 +95,7 @@ impl RSA {
		let mem_bio = try!(MemBio::new());

		unsafe {
		try_ssl!(ffi::PEM_write_bio_RSAPrivateKey(mem_bio.get_handle(),
		try_ssl!(ffi::PEM_write_bio_RSAPrivateKey(mem_bio.handle(),
		self.0,
		ptr::null(),
		ptr::null_mut(),
		@@ -110,7 +110,7 @@ impl RSA {
		pub fn public_key_from_pem(buf: &[u8]) -> Result<RSA, ErrorStack> {
		let mem_bio = try!(MemBioSlice::new(buf));
		unsafe {
		let rsa = try_ssl_null!(ffi::PEM_read_bio_RSA_PUBKEY(mem_bio.get_handle(),
		let rsa = try_ssl_null!(ffi::PEM_read_bio_RSA_PUBKEY(mem_bio.handle(),
		ptr::null_mut(),
		None,
		ptr::null_mut()));
		@@ -123,7 +123,7 @@ impl RSA {
		let mem_bio = try!(MemBio::new());

		unsafe {
		try_ssl!(ffi::PEM_write_bio_RSA_PUBKEY(mem_bio.get_handle(), self.0))
		try_ssl!(ffi::PEM_write_bio_RSA_PUBKEY(mem_bio.handle(), self.0))
		};

		Ok(mem_bio.get_buf().to_owned())