From 67b5fd1c9750d3434adca8d700e265a5238de3be Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sat, 6 May 2017 16:40:33 -0700
Subject: Support public key decode from DER

Closes #629
---
 openssl/src/pkey.rs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'openssl/src')

diff --git a/openssl/src/pkey.rs b/openssl/src/pkey.rs
index 31dc9d82..f8211b25 100644
--- a/openssl/src/pkey.rs
+++ b/openssl/src/pkey.rs
@@ -140,6 +140,7 @@ impl PKey {
 
     private_key_from_pem!(PKey, ffi::PEM_read_bio_PrivateKey);
     public_key_from_pem!(PKey, ffi::PEM_read_bio_PUBKEY);
+    public_key_from_der!(PKey, ffi::d2i_PUBKEY);
 
     /// Deserializes a DER-formatted PKCS#8 private key, using a callback to retrieve the password
     /// if the key is encrpyted.
@@ -310,6 +311,12 @@ mod tests {
         PKey::public_key_from_pem(key).unwrap();
     }
 
+    #[test]
+    fn test_public_key_from_der() {
+        let key = include_bytes!("../test/key.der.pub");
+        PKey::public_key_from_der(key).unwrap();
+    }
+
     #[test]
     fn test_pem() {
         let key = include_bytes!("../test/key.pem");
-- 
cgit v1.2.3