From 575e682da3aa3e55bc415ad44f49417b8be2cecc Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Fri, 23 Jun 2017 21:04:13 -0700
Subject: Add PKey::private_key_from_der

---
 openssl/src/pkey.rs  |   7 +++++++
 openssl/test/key.der | Bin 0 -> 1193 bytes
 2 files changed, 7 insertions(+)
 create mode 100644 openssl/test/key.der

(limited to 'openssl')

diff --git a/openssl/src/pkey.rs b/openssl/src/pkey.rs
index f8211b25..7bda47b5 100644
--- a/openssl/src/pkey.rs
+++ b/openssl/src/pkey.rs
@@ -141,6 +141,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);
+    private_key_from_der!(PKey, ffi::d2i_AutoPrivateKey);
 
     /// Deserializes a DER-formatted PKCS#8 private key, using a callback to retrieve the password
     /// if the key is encrpyted.
@@ -317,6 +318,12 @@ mod tests {
         PKey::public_key_from_der(key).unwrap();
     }
 
+    #[test]
+    fn test_private_key_from_der() {
+        let key = include_bytes!("../test/key.der");
+        PKey::private_key_from_der(key).unwrap();
+    }
+
     #[test]
     fn test_pem() {
         let key = include_bytes!("../test/key.pem");
diff --git a/openssl/test/key.der b/openssl/test/key.der
new file mode 100644
index 00000000..6b6209fd
Binary files /dev/null and b/openssl/test/key.der differ
-- 
cgit v1.2.3