From 1d3277fbee500fda7974250fe58b49ec7b6ba284 Mon Sep 17 00:00:00 2001 From: Cyberunner23 Date: Tue, 5 Jan 2016 13:22:56 -0500 Subject: Added private_rsa_key_from_pem and public_rsa_key_from_pem. --- openssl/src/crypto/pkey.rs | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'openssl/src/crypto') diff --git a/openssl/src/crypto/pkey.rs b/openssl/src/crypto/pkey.rs index 10891224..d6f09931 100644 --- a/openssl/src/crypto/pkey.rs +++ b/openssl/src/crypto/pkey.rs @@ -118,6 +118,54 @@ impl PKey { } } + /// Reads an RSA private key from PEM, takes ownership of handle + pub fn private_rsa_key_from_pem(reader: &mut R) -> Result + where R: Read + { + let mut mem_bio = try!(MemBio::new()); + try!(io::copy(reader, &mut mem_bio).map_err(StreamError)); + + unsafe { + let rsa = try_ssl_null!(ffi::PEM_read_bio_RSAPrivateKey(mem_bio.get_handle(), + ptr::null_mut(), + None, + ptr::null_mut())); + let evp = ffi::EVP_PKEY_new(); + if ffi::EVP_PKEY_set1_RSA(evp, rsa) == 0 { + return Err(SslError::get()); + } + + Ok(PKey { + evp: evp, + parts: Parts::Public, + }) + } + } + + /// Reads an RSA public key from PEM, takes ownership of handle + pub fn public_rsa_key_from_pem(reader: &mut R) -> Result + where R: Read + { + let mut mem_bio = try!(MemBio::new()); + try!(io::copy(reader, &mut mem_bio).map_err(StreamError)); + + unsafe { + let rsa = try_ssl_null!(ffi::PEM_read_bio_RSA_PUBKEY(mem_bio.get_handle(), + ptr::null_mut(), + None, + ptr::null_mut())); + let evp = ffi::EVP_PKEY_new(); + if ffi::EVP_PKEY_set1_RSA(evp, rsa) == 0 { + return Err(SslError::get()); + } + + Ok(PKey { + evp: evp, + parts: Parts::Public, + }) + } + } + fn _tostr(&self, f: unsafe extern "C" fn(*mut ffi::RSA, *const *mut u8) -> c_int) -> Vec { unsafe { let rsa = ffi::EVP_PKEY_get1_RSA(self.evp); -- cgit v1.2.3 From 89e88727ffab25c49e67415ebc6bca555f6358c6 Mon Sep 17 00:00:00 2001 From: Will Tange Date: Thu, 7 Jan 2016 06:28:20 +0100 Subject: Mark PKey as `Send` and `Sync` Provided that the locking function is set, the underlying `ffi::EVP_KEY` type should be safe to use across threads. --- openssl/src/crypto/pkey.rs | 3 +++ 1 file changed, 3 insertions(+) (limited to 'openssl/src/crypto') diff --git a/openssl/src/crypto/pkey.rs b/openssl/src/crypto/pkey.rs index 10891224..e7aa4c8c 100644 --- a/openssl/src/crypto/pkey.rs +++ b/openssl/src/crypto/pkey.rs @@ -57,6 +57,9 @@ pub struct PKey { parts: Parts, } +unsafe impl Send for PKey {} +unsafe impl Sync for PKey {} + /// Represents a public key, optionally with a private key attached. impl PKey { pub fn new() -> PKey { -- cgit v1.2.3 From c0b9a4c8ecafc212cd9a0418751b9df89fec9d1f Mon Sep 17 00:00:00 2001 From: Cyberunner23 Date: Sat, 9 Jan 2016 14:36:01 -0500 Subject: Added tests for private_rsa_key_from_pem() and public_rsa_key_from_pem() --- openssl/src/crypto/pkey.rs | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'openssl/src/crypto') diff --git a/openssl/src/crypto/pkey.rs b/openssl/src/crypto/pkey.rs index d6f09931..fafee78b 100644 --- a/openssl/src/crypto/pkey.rs +++ b/openssl/src/crypto/pkey.rs @@ -661,6 +661,26 @@ mod tests { super::PKey::public_key_from_pem(&mut file).unwrap(); } + #[test] + fn test_private_rsa_key_from_pem() { + let key_path = Path::new("test/key.pem"); + let mut file = File::open(&key_path) + .ok() + .expect("Failed to open `test/key.pem`"); + + super::PKey::private_rsa_key_from_pem(&mut file).unwrap(); + } + + #[test] + fn test_public_rsa_key_from_pem() { + let key_path = Path::new("test/key.pem.pub"); + let mut file = File::open(&key_path) + .ok() + .expect("Failed to open `test/key.pem.pub`"); + + super::PKey::public_rsa_key_from_pem(&mut file).unwrap(); + } + #[test] fn test_private_encrypt() { let mut k0 = super::PKey::new(); -- cgit v1.2.3 From 3c51f159a7f16c95061f51355536a66f77c6c63c Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Tue, 19 Jan 2016 21:48:44 -0500 Subject: crypto/pkey: impl Clone for PKey using openssl's ref counting --- openssl/src/crypto/pkey.rs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'openssl/src/crypto') diff --git a/openssl/src/crypto/pkey.rs b/openssl/src/crypto/pkey.rs index 9d653c13..934a93ed 100644 --- a/openssl/src/crypto/pkey.rs +++ b/openssl/src/crypto/pkey.rs @@ -52,6 +52,10 @@ fn openssl_hash_nid(hash: HashType) -> c_int { } } +extern "C" { + fn rust_EVP_PKEY_clone(pkey: *mut ffi::EVP_PKEY); +} + pub struct PKey { evp: *mut ffi::EVP_PKEY, parts: Parts, @@ -600,6 +604,16 @@ impl Drop for PKey { } } +impl Clone for PKey { + fn clone(&self) -> Self { + unsafe { + rust_EVP_PKEY_clone(self.evp); + } + + PKey::from_handle(self.evp, self.parts) + } +} + #[cfg(test)] mod tests { use std::path::Path; -- cgit v1.2.3