From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 23 Oct 2015 18:19:57 +0000 (+0100)
Subject: EC_KEY_METHOD copy support
X-Git-Tag: OpenSSL_1_1_0-pre1~59
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ea0392b921598e415c754dcf4b5c61c7fa337a59;p=oweals%2Fopenssl.git

EC_KEY_METHOD copy support

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index e2681c9acb..1b941b4844 100644
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -132,6 +132,15 @@ EC_KEY *EC_KEY_copy(EC_KEY *dest, const EC_KEY *src)
         ECerr(EC_F_EC_KEY_COPY, ERR_R_PASSED_NULL_PARAMETER);
         return NULL;
     }
+    if (src->meth != dest->meth) {
+        if (dest->meth->finish)
+            dest->meth->finish(dest);
+#ifndef OPENSSL_NO_ENGINE
+        if (dest->engine && ENGINE_finish(dest->engine) == 0)
+            return 0;
+        dest->engine = NULL;
+#endif
+    }
     /* copy the parameters */
     if (src->group) {
         const EC_METHOD *meth = EC_GROUP_method_of(src->group);
@@ -182,12 +191,24 @@ EC_KEY *EC_KEY_copy(EC_KEY *dest, const EC_KEY *src)
     dest->version = src->version;
     dest->flags = src->flags;
 
+    if (src->meth != dest->meth) {
+#ifndef OPENSSL_NO_ENGINE
+        if (src->engine && ENGINE_init(src->engine) == 0)
+            return 0;
+        dest->engine = src->engine;
+#endif
+        dest->meth = src->meth;
+    }
+
+    if (src->meth->copy && src->meth->copy(dest, src) == 0)
+        return 0;
+
     return dest;
 }
 
 EC_KEY *EC_KEY_dup(const EC_KEY *ec_key)
 {
-    EC_KEY *ret = EC_KEY_new();
+    EC_KEY *ret = EC_KEY_new_method(ec_key->engine);
     if (ret == NULL)
         return NULL;
     if (EC_KEY_copy(ret, ec_key) == NULL) {
diff --git a/crypto/ec/ec_kmeth.c b/crypto/ec/ec_kmeth.c
index 77b4443fa3..4581880b84 100644
--- a/crypto/ec/ec_kmeth.c
+++ b/crypto/ec/ec_kmeth.c
@@ -63,7 +63,7 @@
 static const EC_KEY_METHOD openssl_ec_key_method = {
     "OpenSSL EC_KEY method",
     0,
-    0,0,
+    0,0,0,
     ossl_ec_key_gen,
     ossl_ecdh_compute_key
 };
diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h
index 3aaee31575..2db8779c57 100644
--- a/crypto/ec/ec_lcl.h
+++ b/crypto/ec/ec_lcl.h
@@ -562,6 +562,7 @@ struct ec_key_method_st {
     int32_t flags;
     int (*init)(EC_KEY *key);
     void (*finish)(EC_KEY *key);
+    int (*copy)(EC_KEY *dest, const EC_KEY *src);
     int (*keygen)(EC_KEY *key);
     int (*compute_key)(void *out, size_t outlen, const EC_POINT *pub_key,
                        EC_KEY *ecdh,