Method renames (59fe9013) · Commits · Public Repositories / Rust Openssl

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 handle(&self) -> *mut ffi::BIO {
		pub fn as_ptr(&self) -> *mut ffi::BIO {
		self.0
		}
		}
		@@ -53,7 +53,7 @@ impl MemBio {
		Ok(MemBio(bio))
		}

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

openssl/src/crypto/dsa.rs

+5 −5

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

		unsafe {
		let dsa = try_ssl_null!(ffi::PEM_read_bio_DSAPrivateKey(mem_bio.handle(),
		let dsa = try_ssl_null!(ffi::PEM_read_bio_DSAPrivateKey(mem_bio.as_ptr(),
		ptr::null_mut(),
		None,
		ptr::null_mut()));
		@@ -96,7 +96,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.handle(),
		let dsa = try_ssl_null!(ffi::PEM_read_bio_DSAPrivateKey(mem_bio.as_ptr(),
		ptr::null_mut(),
		Some(invoke_passwd_cb::<F>),
		cb_ptr));
		@@ -113,7 +113,7 @@ impl DSA {
		let mem_bio = try!(MemBio::new());

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

		let mem_bio = try!(MemBioSlice::new(buf));
		unsafe {
		let dsa = try_ssl_null!(ffi::PEM_read_bio_DSA_PUBKEY(mem_bio.handle(),
		let dsa = try_ssl_null!(ffi::PEM_read_bio_DSA_PUBKEY(mem_bio.as_ptr(),
		ptr::null_mut(),
		None,
		ptr::null_mut()));
		@@ -139,7 +139,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.handle(), self.0)) };
		unsafe { try_ssl!(ffi::PEM_write_bio_DSA_PUBKEY(mem_bio.as_ptr(), self.0)) };
		Ok(mem_bio.get_buf().to_owned())
		}

openssl/src/crypto/pkey.rs

+11 −11

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ impl PKey {
		}
		}

		pub unsafe fn from_handle(handle: *mut ffi::EVP_PKEY) -> PKey {
		pub unsafe fn from_ptr(handle: *mut ffi::EVP_PKEY) -> PKey {
		PKey(handle)
		}

		@@ -35,11 +35,11 @@ impl PKey {
		ffi::init();
		let mem_bio = try!(MemBioSlice::new(buf));
		unsafe {
		let evp = try_ssl_null!(ffi::PEM_read_bio_PrivateKey(mem_bio.handle(),
		let evp = try_ssl_null!(ffi::PEM_read_bio_PrivateKey(mem_bio.as_ptr(),
		ptr::null_mut(),
		None,
		ptr::null_mut()));
		Ok(PKey::from_handle(evp))
		Ok(PKey::from_ptr(evp))
		}
		}

		@@ -55,11 +55,11 @@ 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.handle(),
		let evp = try_ssl_null!(ffi::PEM_read_bio_PrivateKey(mem_bio.as_ptr(),
		ptr::null_mut(),
		Some(invoke_passwd_cb::<F>),
		&mut cb as mut _ as mut c_void));
		Ok(PKey::from_handle(evp))
		Ok(PKey::from_ptr(evp))
		}
		}

		@@ -68,11 +68,11 @@ impl PKey {
		ffi::init();
		let mem_bio = try!(MemBioSlice::new(buf));
		unsafe {
		let evp = try_ssl_null!(ffi::PEM_read_bio_PUBKEY(mem_bio.handle(),
		let evp = try_ssl_null!(ffi::PEM_read_bio_PUBKEY(mem_bio.as_ptr(),
		ptr::null_mut(),
		None,
		ptr::null_mut()));
		Ok(PKey::from_handle(evp))
		Ok(PKey::from_ptr(evp))
		}
		}

		@@ -91,7 +91,7 @@ impl PKey {
		unsafe {
		let rsa = try_ssl_null!(ffi::EVP_PKEY_get1_RSA(self.0));
		// this is safe as the ffi increments a reference counter to the internal key
		Ok(RSA::from_raw(rsa))
		Ok(RSA::from_ptr(rsa))
		}
		}

		@@ -100,7 +100,7 @@ impl PKey {
		pub fn private_key_to_pem(&self) -> Result<Vec<u8>, ErrorStack> {
		let mem_bio = try!(MemBio::new());
		unsafe {
		try_ssl!(ffi::PEM_write_bio_PrivateKey(mem_bio.handle(),
		try_ssl!(ffi::PEM_write_bio_PrivateKey(mem_bio.as_ptr(),
		self.0,
		ptr::null(),
		ptr::null_mut(),
		@@ -115,11 +115,11 @@ impl PKey {
		/// Stores public key as a PEM
		pub fn public_key_to_pem(&self) -> Result<Vec<u8>, ErrorStack> {
		let mem_bio = try!(MemBio::new());
		unsafe { try_ssl!(ffi::PEM_write_bio_PUBKEY(mem_bio.handle(), self.0)) }
		unsafe { try_ssl!(ffi::PEM_write_bio_PUBKEY(mem_bio.as_ptr(), self.0)) }
		Ok(mem_bio.get_buf().to_owned())
		}

		pub fn handle(&self) -> *mut ffi::EVP_PKEY {
		pub fn as_ptr(&self) -> *mut ffi::EVP_PKEY {
		return self.0;
		}

openssl/src/crypto/rsa.rs

+6 −6

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ impl RSA {
		}
		}

		pub unsafe fn from_raw(rsa: *mut ffi::RSA) -> RSA {
		pub unsafe fn from_ptr(rsa: *mut ffi::RSA) -> RSA {
		RSA(rsa)
		}

		@@ -89,7 +89,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.handle(),
		let rsa = try_ssl_null!(ffi::PEM_read_bio_RSAPrivateKey(mem_bio.as_ptr(),
		ptr::null_mut(),
		None,
		ptr::null_mut()));
		@@ -106,7 +106,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.handle(),
		let rsa = try_ssl_null!(ffi::PEM_read_bio_RSAPrivateKey(mem_bio.as_ptr(),
		ptr::null_mut(),
		Some(invoke_passwd_cb::<F>),
		cb_ptr));
		@@ -119,7 +119,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.handle(),
		let rsa = try_ssl_null!(ffi::PEM_read_bio_RSA_PUBKEY(mem_bio.as_ptr(),
		ptr::null_mut(),
		None,
		ptr::null_mut()));
		@@ -132,7 +132,7 @@ impl RSA {
		let mem_bio = try!(MemBio::new());

		unsafe {
		try_ssl!(ffi::PEM_write_bio_RSAPrivateKey(mem_bio.handle(),
		try_ssl!(ffi::PEM_write_bio_RSAPrivateKey(mem_bio.as_ptr(),
		self.0,
		ptr::null(),
		ptr::null_mut(),
		@@ -148,7 +148,7 @@ impl RSA {
		let mem_bio = try!(MemBio::new());

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

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

openssl/src/dh/mod.rs

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ impl DH {
		pub fn from_pem(buf: &[u8]) -> Result<DH, ErrorStack> {
		let mem_bio = try!(MemBioSlice::new(buf));
		let dh = unsafe {
		ffi::PEM_read_bio_DHparams(mem_bio.handle(), ptr::null_mut(), None, ptr::null_mut())
		ffi::PEM_read_bio_DHparams(mem_bio.as_ptr(), ptr::null_mut(), None, ptr::null_mut())
		};
		try_ssl_null!(dh);
		Ok(DH(dh))