Unverified Commit 89bd6d61 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1127 from snapview/cms-pem 

Add `to_pem()` and `from_pem()` for `CmsContentInfo`
parents 3629bb6f fab6ea47

openssl-sys/src/pem.rs

+10 −0
Original line number Diff line number Diff line
@@ -146,6 +146,16 @@ extern "C" { 
    ) -> *mut PKCS7;



    pub fn PEM_write_bio_PKCS7(bp: *mut BIO, x: *mut PKCS7) -> c_int;



    #[cfg(ossl101)]

    pub fn PEM_read_bio_CMS(

        bio: *mut BIO,

        out: *mut *mut CMS_ContentInfo,

        callback: pem_password_cb,

        user_data: *mut c_void,

    ) -> *mut CMS_ContentInfo;

    #[cfg(ossl101)]

    pub fn PEM_write_bio_CMS(bio: *mut BIO, cms: *const CMS_ContentInfo) -> c_int;

}



pub const PEM_R_NO_START_LINE: c_int = 108;

openssl/src/cms.rs

+44 −13
Original line number Diff line number Diff line
@@ -105,6 +105,16 @@ impl CmsContentInfoRef { 
        to_der,

        ffi::i2d_CMS_ContentInfo

    }



    to_pem! {

        /// Serializes this CmsContentInfo using DER.

        ///

        /// OpenSSL documentation at [`PEM_write_bio_CMS`]

        ///

        /// [`PEM_write_bio_CMS`]: https://www.openssl.org/docs/man1.1.0/man3/PEM_write_bio_CMS.html

        to_pem,

        ffi::PEM_write_bio_CMS

    }

}



impl CmsContentInfo {
@@ -134,6 +144,17 @@ impl CmsContentInfo { 
        ffi::d2i_CMS_ContentInfo

    }



    from_pem! {

        /// Deserializes a PEM-encoded ContentInfo structure.

        ///

        /// This corresponds to [`PEM_read_bio_CMS`].

        ///

        /// [`PEM_read_bio_CMS`]: https://www.openssl.org/docs/man1.1.0/man3/PEM_read_bio_CMS.html

        from_pem,

        CmsContentInfo,

        ffi::PEM_read_bio_CMS

    }



    /// Given a signing cert `signcert`, private key `pkey`, a certificate stack `certs`,

    /// data `data` and flags `flags`, create a CmsContentInfo struct.

    ///
@@ -227,13 +248,23 @@ mod test { 


        let encrypt = CmsContentInfo::encrypt(&cert_stack, &input.as_bytes(), Cipher::des_ede3_cbc(), CMSOptions::empty())

            .expect("failed create encrypted cms");

        let encrypt = encrypt.to_der().expect("failed to create der from cms");



        // decrypt cms message using private key cert

        let decrypt = CmsContentInfo::from_der(&encrypt).expect("failed read cms from der");

        // decrypt cms message using private key cert (DER)

        {

            let encrypted_der = encrypt.to_der().expect("failed to create der from cms");

            let decrypt = CmsContentInfo::from_der(&encrypted_der).expect("failed read cms from der");

            let decrypt = decrypt.decrypt(&priv_cert.pkey, &priv_cert.cert).expect("failed to decrypt cms");

            let decrypt = String::from_utf8(decrypt).expect("failed to create string from cms content");

            assert_eq!(input, decrypt);

        }



        // decrypt cms message using private key cert (PEM)

        {

            let encrypted_pem = encrypt.to_pem().expect("failed to create pem from cms");

            let decrypt = CmsContentInfo::from_pem(&encrypted_pem).expect("failed read cms from pem");

            let decrypt = decrypt.decrypt(&priv_cert.pkey, &priv_cert.cert).expect("failed to decrypt cms");

            let decrypt = String::from_utf8(decrypt).expect("failed to create string from cms content");

            assert_eq!(input, decrypt);

        }

    }

}