diff options
| author | Steven Fackler <[email protected]> | 2016-11-13 17:56:48 +0000 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2016-11-13 17:56:48 +0000 |
| commit | ccef9e339dc3717761fc9e70c34f1df86b608579 (patch) | |
| tree | 83778d79877e81416f67ed06c5d0b0d01a309c04 /openssl/src/pkey.rs | |
| parent | Macroise to_pem (diff) | |
| download | rust-openssl-ccef9e339dc3717761fc9e70c34f1df86b608579.tar.xz rust-openssl-ccef9e339dc3717761fc9e70c34f1df86b608579.zip | |
Macroise from_pem
Diffstat (limited to 'openssl/src/pkey.rs')
| -rw-r--r-- | openssl/src/pkey.rs | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/openssl/src/pkey.rs b/openssl/src/pkey.rs index 05df2f4b..b5ccd3cc 100644 --- a/openssl/src/pkey.rs +++ b/openssl/src/pkey.rs @@ -137,6 +137,7 @@ impl PKey { } private_key_from_pem!(PKey, ffi::PEM_read_bio_PrivateKey); + public_key_from_pem!(PKey, ffi::PEM_read_bio_PUBKEY); #[deprecated(since = "0.9.2", note = "use private_key_from_pem_callback")] pub fn private_key_from_pem_cb<F>(buf: &[u8], pass_cb: F) -> Result<PKey, ErrorStack> @@ -153,19 +154,6 @@ impl PKey { Ok(PKey::from_ptr(evp)) } } - - /// Reads a public key from PEM. - pub fn public_key_from_pem(buf: &[u8]) -> Result<PKey, ErrorStack> { - ffi::init(); - let mem_bio = try!(MemBioSlice::new(buf)); - unsafe { - let evp = try!(cvt_p(ffi::PEM_read_bio_PUBKEY(mem_bio.as_ptr(), - ptr::null_mut(), - None, - ptr::null_mut()))); - Ok(PKey::from_ptr(evp)) - } - } } #[cfg(test)] |