From e655b561a72204d65bdb7712bed9d8c2b040f4c7 Mon Sep 17 00:00:00 2001
From: Rohit Aggarwal <rohit.aggarwal@oliverwyman.com>
Date: Fri, 9 Mar 2018 15:58:56 +0000
Subject: [PATCH 1/2] Added a function to create a EC<Key> from its parts

---
 openssl/src/ec.rs | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/openssl/src/ec.rs b/openssl/src/ec.rs
index ad3b0f54..2ddeef2e 100644
--- a/openssl/src/ec.rs
+++ b/openssl/src/ec.rs
@@ -729,6 +729,33 @@ impl EcKey<Private> {
         }
     }
 
+    /// Constructs an public/private key pair given a curve, a private key and a public key point.
+    pub fn from_keys(
+        group: &EcGroupRef,
+        private_number: &BigNumRef,
+        public_key: &EcPointRef,
+    ) -> Result<EcKey<Private>, ErrorStack> {
+        unsafe {
+            cvt_p(ffi::EC_KEY_new())
+                .map(|p| EcKey::from_ptr(p))
+                .and_then(|key| {
+                    cvt(ffi::EC_KEY_set_group(key.as_ptr(), group.as_ptr())).map(|_| key)
+                })
+                .and_then(|key| {
+                    cvt(ffi::EC_KEY_set_private_key(
+                        key.as_ptr(),
+                        private_number.as_ptr(),
+                    )).map(|_| key)
+                })
+                .and_then(|key| {
+                    cvt(ffi::EC_KEY_set_public_key(
+                        key.as_ptr(),
+                        public_key.as_ptr(),
+                    )).map(|_| key)
+                })
+        }
+    }
+
     private_key_from_pem! {
         /// Deserializes a private key from a PEM-encoded ECPrivateKey structure.
         ///
@@ -845,6 +872,18 @@ mod test {
         assert!(ec_key.check_key().is_ok());
     }
 
+    #[test]
+    fn key_from_keys() {
+        let group = EcGroup::from_curve_name(Nid::X9_62_PRIME256V1).unwrap();
+        let key = EcKey::generate(&group).unwrap();
+
+        let dup_key = EcKey::from_keys(&group, key.private_key(), key.public_key()).unwrap();
+        let res = dup_key.check_key().unwrap();
+
+        assert!(res == ());
+        assert!(key.private_key() == dup_key.private_key());
+    }
+
     #[test]
     fn key_from_affine_coordinates() {
         let group = EcGroup::from_curve_name(Nid::X9_62_PRIME256V1).unwrap();

From e3a657d22b2f1ed2ad24a64fcfa8e4ce77ef3331 Mon Sep 17 00:00:00 2001
From: Rohit Aggarwal <rohit.aggarwal@oliverwyman.com>
Date: Tue, 13 Mar 2018 08:57:35 +0000
Subject: [PATCH 2/2] Change function name to be similar to RSA one

---
 openssl/src/ec.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openssl/src/ec.rs b/openssl/src/ec.rs
index 2ddeef2e..c4800c73 100644
--- a/openssl/src/ec.rs
+++ b/openssl/src/ec.rs
@@ -730,7 +730,7 @@ impl EcKey<Private> {
     }
 
     /// Constructs an public/private key pair given a curve, a private key and a public key point.
-    pub fn from_keys(
+    pub fn from_private_components(
         group: &EcGroupRef,
         private_number: &BigNumRef,
         public_key: &EcPointRef,
@@ -873,11 +873,11 @@ mod test {
     }
 
     #[test]
-    fn key_from_keys() {
+    fn key_from_private_components() {
         let group = EcGroup::from_curve_name(Nid::X9_62_PRIME256V1).unwrap();
         let key = EcKey::generate(&group).unwrap();
 
-        let dup_key = EcKey::from_keys(&group, key.private_key(), key.public_key()).unwrap();
+        let dup_key = EcKey::from_private_components(&group, key.private_key(), key.public_key()).unwrap();
         let res = dup_key.check_key().unwrap();
 
         assert!(res == ());