diff options
| author | Steven Fackler <[email protected]> | 2016-08-05 21:07:17 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-08-05 21:07:17 -0700 |
| commit | bc97d088b0e71a1bde0a88bc548718c427124d0c (patch) | |
| tree | d29251fdd659b809e0a509fc6d78821b7f1bec01 /openssl/src/crypto | |
| parent | Fix pkey method safety (diff) | |
| download | rust-openssl-bc97d088b0e71a1bde0a88bc548718c427124d0c.tar.xz rust-openssl-bc97d088b0e71a1bde0a88bc548718c427124d0c.zip | |
get_handle -> handle
Diffstat (limited to 'openssl/src/crypto')
| -rw-r--r-- | openssl/src/crypto/dsa.rs | 10 | ||||
| -rw-r--r-- | openssl/src/crypto/pkey.rs | 10 | ||||
| -rw-r--r-- | openssl/src/crypto/rsa.rs | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/openssl/src/crypto/dsa.rs b/openssl/src/crypto/dsa.rs index de35893b..40702627 100644 --- a/openssl/src/crypto/dsa.rs +++ b/openssl/src/crypto/dsa.rs @@ -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()) } diff --git a/openssl/src/crypto/pkey.rs b/openssl/src/crypto/pkey.rs index 9f72464b..e554f3b2 100644 --- a/openssl/src/crypto/pkey.rs +++ b/openssl/src/crypto/pkey.rs @@ -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()) } diff --git a/openssl/src/crypto/rsa.rs b/openssl/src/crypto/rsa.rs index 226b2aab..5c70c8ea 100644 --- a/openssl/src/crypto/rsa.rs +++ b/openssl/src/crypto/rsa.rs @@ -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()) |