Commit 7bd4fbb6 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #508 from simias/pkey 

Add method to encode a public key as a DER blob
parents 43911db2 9ea27c12

openssl-sys/src/lib.rs

+2 −0
Original line number Diff line number Diff line
@@ -1693,6 +1693,8 @@ extern { 
    pub fn i2d_X509_bio(b: *mut BIO, x: *mut X509) -> c_int;

    pub fn i2d_X509_REQ_bio(b: *mut BIO, x: *mut X509_REQ) -> c_int;



    pub fn i2d_PUBKEY_bio(b: *mut BIO, x: *mut EVP_PKEY) -> c_int;



    pub fn i2d_RSA_PUBKEY(k: *mut RSA, buf: *mut *mut u8) -> c_int;

    pub fn d2i_RSA_PUBKEY(k: *mut *mut RSA, buf: *mut *const u8, len: c_long) -> *mut RSA;

    pub fn i2d_RSAPrivateKey(k: *const RSA, buf: *mut *mut u8) -> c_int;

openssl/src/pkey.rs

+10 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ impl Ref<PKey> { 
        Ok(mem_bio.get_buf().to_owned())

    }



    /// Stores public key as a PEM

    /// Encode public key in PEM format

    pub fn public_key_to_pem(&self) -> Result<Vec<u8>, ErrorStack> {

        let mem_bio = try!(MemBio::new());

        unsafe {
@@ -49,6 +49,15 @@ impl Ref<PKey> { 
        Ok(mem_bio.get_buf().to_owned())

    }



    /// Encode public key in DER format

    pub fn public_key_to_der(&self) -> Result<Vec<u8>, ErrorStack> {

        let mem_bio = try!(MemBio::new());

        unsafe {

            try!(cvt(ffi::i2d_PUBKEY_bio(mem_bio.as_ptr(), self.as_ptr())));

        }

        Ok(mem_bio.get_buf().to_owned())

    }



    pub fn public_eq(&self, other: &Ref<PKey>) -> bool {

        unsafe { ffi::EVP_PKEY_cmp(self.as_ptr(), other.as_ptr()) == 1 }

    }