Merge pull request #328 from Cyberunner23/PemRSA

Add support for RSA PEM files.

2 files changed, 71 insertions, 0 deletions

diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index f780b6d9..5554d478 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -527,6 +527,9 @@ extern "C" {
     pub fn PEM_read_bio_PUBKEY(bio: *mut BIO, out: *mut *mut EVP_PKEY, callback: Option<PasswordCallback>,
                              user_data: *mut c_void) -> *mut X509;
 
+    pub fn PEM_read_bio_RSAPrivateKey(bio: *mut BIO, rsa: *mut *mut RSA, callback: Option<PasswordCallback>, user_data: *mut c_void) -> *mut RSA;
+    pub fn PEM_read_bio_RSA_PUBKEY(bio:    *mut BIO, rsa: *mut *mut RSA, callback: Option<PasswordCallback>, user_data: *mut c_void) -> *mut RSA;
+
     pub fn PEM_write_bio_PrivateKey(bio: *mut BIO, pkey: *mut EVP_PKEY, cipher: *const EVP_CIPHER,
                                     kstr: *mut c_char, klen: c_int,
                                     callback: Option<PasswordCallback>,
diff --git a/openssl/src/crypto/pkey.rs b/openssl/src/crypto/pkey.rs
index e7aa4c8c..9d653c13 100644
--- a/openssl/src/crypto/pkey.rs
+++ b/openssl/src/crypto/pkey.rs
@@ -121,6 +121,54 @@ impl PKey {
         }
     }
 
+    /// Reads an RSA private key from PEM, takes ownership of handle
+    pub fn private_rsa_key_from_pem<R>(reader: &mut R) -> Result<PKey, SslError>
+    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<R>(reader: &mut R) -> Result<PKey, SslError>
+    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<u8> {
         unsafe {
             let rsa = ffi::EVP_PKEY_get1_RSA(self.evp);
@@ -617,6 +665,26 @@ mod tests {
     }
 
     #[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();
         let mut k1 = super::PKey::new();