Commit ffa9d330 authored by Nathan Lilienthal's avatar Nathan Lilienthal
Browse files

Add public key PEM read function.

parent d9c22137

openssl-sys/src/lib.rs

+2 −0
Original line number Diff line number Diff line
@@ -485,6 +485,8 @@ extern "C" { 
                             user_data: *mut c_void) -> *mut X509_REQ;

    pub fn PEM_read_bio_PrivateKey(bio: *mut BIO, out: *mut *mut EVP_PKEY, callback: Option<PasswordCallback>,

                             user_data: *mut c_void) -> *mut X509;

    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_write_bio_PrivateKey(bio: *mut BIO, pkey: *mut EVP_PKEY, cipher: *const EVP_CIPHER,

                                    kstr: *mut c_char, klen: c_int,

openssl/src/crypto/pkey.rs

+26 −0
Original line number Diff line number Diff line
@@ -96,6 +96,22 @@ impl PKey { 
        }

    }



    /// Reads public key from PEM, takes ownership of handle

    pub fn public_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 evp = try_ssl_null!(ffi::PEM_read_bio_PUBKEY(mem_bio.get_handle(),

                                                                 ptr::null_mut(),

                                                                 None, ptr::null_mut()));

            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);
@@ -466,6 +482,16 @@ mod tests { 
        super::PKey::private_key_from_pem(&mut file).unwrap();

    }



    #[test]

    fn test_public_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_key_from_pem(&mut file).unwrap();

    }



    #[test]

    fn test_encrypt() {

        let mut k0 = super::PKey::new();

openssl/test/key.pem.pub

0 → 100644
+9 −0
Original line number Diff line number Diff line 
-----BEGIN PUBLIC KEY-----

MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr1bXMptaIgOL9PVL8a7W

KG/C8+IbxP018eMBQZT0SnPQmXp0Q8Aai/F+AEDE7b5sO5U7WdxU4GRYw0wqkQNF

si78KNfoj2ZMlx6NRfl4UKuzrpGTPgQxuKDYedngPpWcbmW4P3zEL2Y7b18n9NJr

atRUzH1Zh/ReRO525Xadu58aviPw1Mzgse7cKyzb03Gll9noLnYNIIpO8jL+QyrD

8qNmfacmR20U0a6XDTtmsmk7AitGETICbTT0KRf+oAP0yIHoonllPpNLUEPZQjrp

ClS/S/wKdj7gaq9TaMbHULhFMjbCV8cuPu//rUAuWp3riaznZGOVQyn3Dp2CB3ad

yQIDAQAB

-----END PUBLIC KEY-----