Commit a7fa2603 authored by oberien's avatar oberien
Browse files

Support for PKCS#8 unencrypted private key deserialization

parent 454cb6f9

openssl-sys/src/ossl_typ.rs

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ cfg_if! { 
    }

}



pub enum PKCS8_PRIV_KEY_INFO {}



pub enum EVP_PKEY_ASN1_METHOD {}



pub enum EVP_PKEY_CTX {}

openssl-sys/src/pem.rs

+7 −0
Original line number Diff line number Diff line
@@ -137,6 +137,13 @@ extern "C" { 
        cb: pem_password_cb,

        u: *mut c_void,

    ) -> *mut EVP_PKEY;

    pub fn d2i_PKCS8_PRIV_KEY_INFO_bio(

        bp: *mut BIO,

        x: *mut *mut PKCS8_PRIV_KEY_INFO,

    ) -> *mut PKCS8_PRIV_KEY_INFO;

    pub fn EVP_PKCS82PKEY(

        p8: *const PKCS8_PRIV_KEY_INFO,

    ) -> *mut EVP_PKEY;



    pub fn PEM_read_bio_PKCS7(

        bio: *mut BIO,

openssl/src/pkey.rs

+25 −0
Original line number Diff line number Diff line
@@ -524,6 +524,25 @@ impl PKey<Private> { 
        ffi::d2i_AutoPrivateKey

    }



    /// Deserializes a DER-formatted PKCS#8 unencrypted private key.

    ///

    /// This method is mainly for interoperability reasons. Encrypted keyfiles should be preferred.

    pub fn private_key_from_pkcs8(

        der: &[u8],

    ) -> Result<PKey<Private>, ErrorStack>

    {

        unsafe {

            ffi::init();

            let bio = MemBioSlice::new(der)?;

            let p8inf = cvt_p(ffi::d2i_PKCS8_PRIV_KEY_INFO_bio(

                bio.as_ptr(),

                ptr::null_mut(),

            ))?;

            cvt_p(ffi::EVP_PKCS82PKEY(p8inf))

                .map(|p| PKey::from_ptr(p))

        }

    }



    /// Deserializes a DER-formatted PKCS#8 private key, using a callback to retrieve the password

    /// if the key is encrpyted.

    ///
@@ -639,6 +658,12 @@ mod tests { 
        assert!(PKey::private_key_from_pem_passphrase(&pem, b"fizzbuzz").is_err());

    }



    #[test]

    fn test_unencrypted_pkcs8() {

        let key = include_bytes!("../test/pkcs8-nocrypt.der");

        PKey::private_key_from_pkcs8(key).unwrap();

    }



    #[test]

    fn test_encrypted_pkcs8_passphrase() {

        let key = include_bytes!("../test/pkcs8.der");

openssl/test/pkcs8-nocrypt.der

0 → 100644
+1.19 KiB

File added.

No diff preview for this file type.

View file