Convert ECParameters_dup() from a macro that uses ASN1_dup_of() into an

actual function. This removes the last ASN1_dup_of usage from the tree.

Feedback from doug@ and miod@

6 files changed, 40 insertions, 10 deletions

diff --git a/src/lib/libcrypto/doc/ec.pod b/src/lib/libcrypto/doc/ec.pod
index 7d57ba8ea0..891948e4f6 100644
--- a/src/lib/libcrypto/doc/ec.pod
+++ b/src/lib/libcrypto/doc/ec.pod
@@ -158,7 +158,7 @@ ec - Elliptic Curve functions
  int    EC_KEY_print(BIO *bp, const EC_KEY *key, int off);
  int    ECParameters_print_fp(FILE *fp, const EC_KEY *key);
  int    EC_KEY_print_fp(FILE *fp, const EC_KEY *key, int off);
- #define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x)
+ EC_KEY *ECParameters_dup(EC_KEY *key);
  #define EVP_PKEY_CTX_set_ec_paramgen_curve_nid(ctx, nid) \
         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, EVP_PKEY_OP_PARAMGEN, \
                                 EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID, nid, NULL)
diff --git a/src/lib/libcrypto/ec/ec.h b/src/lib/libcrypto/ec/ec.h
index 3b409ff92d..a1ece2e0d5 100644
--- a/src/lib/libcrypto/ec/ec.h
+++ b/src/lib/libcrypto/ec/ec.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec.h,v 1.10 2015/06/20 13:26:08 jsing Exp $ */
+/* $OpenBSD: ec.h,v 1.11 2015/10/13 15:25:18 jsing Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -945,8 +945,7 @@ int	ECParameters_print_fp(FILE *fp, const EC_KEY *key);
  */
 int     EC_KEY_print_fp(FILE *fp, const EC_KEY *key, int off);
 
-
-#define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x)
+EC_KEY *ECParameters_dup(EC_KEY *key);
 
 #ifndef __cplusplus
 #if defined(__SUNPRO_C)
diff --git a/src/lib/libcrypto/ec/ec_lib.c b/src/lib/libcrypto/ec/ec_lib.c
index c28ab18fc0..2b5abbd4bb 100644
--- a/src/lib/libcrypto/ec/ec_lib.c
+++ b/src/lib/libcrypto/ec/ec_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_lib.c,v 1.19 2015/09/10 15:56:25 jsing Exp $ */
+/* $OpenBSD: ec_lib.c,v 1.20 2015/10/13 15:25:18 jsing Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -1102,3 +1102,19 @@ EC_GROUP_have_precompute_mult(const EC_GROUP * group)
                 return 0;       /* cannot tell whether precomputation has
                                  * been performed */
 }
+
+EC_KEY *
+ECParameters_dup(EC_KEY *key)
+{
+        unsigned char *p = NULL;
+        EC_KEY *k = NULL;
+        int len;
+
+        if (key == NULL)
+                return (NULL);
+
+        if ((len = i2d_ECParameters(key, &p)) > 0)
+                k = d2i_ECParameters(NULL, (const unsigned char **)&p, len);
+
+        return (k);     
+}
diff --git a/src/lib/libssl/src/crypto/ec/ec.h b/src/lib/libssl/src/crypto/ec/ec.h
index 3b409ff92d..a1ece2e0d5 100644
--- a/src/lib/libssl/src/crypto/ec/ec.h
+++ b/src/lib/libssl/src/crypto/ec/ec.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec.h,v 1.10 2015/06/20 13:26:08 jsing Exp $ */
+/* $OpenBSD: ec.h,v 1.11 2015/10/13 15:25:18 jsing Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -945,8 +945,7 @@ int	ECParameters_print_fp(FILE *fp, const EC_KEY *key);
  */
 int     EC_KEY_print_fp(FILE *fp, const EC_KEY *key, int off);
 
-
-#define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x)
+EC_KEY *ECParameters_dup(EC_KEY *key);
 
 #ifndef __cplusplus
 #if defined(__SUNPRO_C)
diff --git a/src/lib/libssl/src/crypto/ec/ec_lib.c b/src/lib/libssl/src/crypto/ec/ec_lib.c
index c28ab18fc0..2b5abbd4bb 100644
--- a/src/lib/libssl/src/crypto/ec/ec_lib.c
+++ b/src/lib/libssl/src/crypto/ec/ec_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_lib.c,v 1.19 2015/09/10 15:56:25 jsing Exp $ */
+/* $OpenBSD: ec_lib.c,v 1.20 2015/10/13 15:25:18 jsing Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -1102,3 +1102,19 @@ EC_GROUP_have_precompute_mult(const EC_GROUP * group)
                 return 0;       /* cannot tell whether precomputation has
                                  * been performed */
 }
+
+EC_KEY *
+ECParameters_dup(EC_KEY *key)
+{
+        unsigned char *p = NULL;
+        EC_KEY *k = NULL;
+        int len;
+
+        if (key == NULL)
+                return (NULL);
+
+        if ((len = i2d_ECParameters(key, &p)) > 0)
+                k = d2i_ECParameters(NULL, (const unsigned char **)&p, len);
+
+        return (k);     
+}
diff --git a/src/lib/libssl/src/doc/crypto/ec.pod b/src/lib/libssl/src/doc/crypto/ec.pod
index 7d57ba8ea0..891948e4f6 100644
--- a/src/lib/libssl/src/doc/crypto/ec.pod
+++ b/src/lib/libssl/src/doc/crypto/ec.pod
@@ -158,7 +158,7 @@ ec - Elliptic Curve functions
  int    EC_KEY_print(BIO *bp, const EC_KEY *key, int off);
  int    ECParameters_print_fp(FILE *fp, const EC_KEY *key);
  int    EC_KEY_print_fp(FILE *fp, const EC_KEY *key, int off);
- #define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x)
+ EC_KEY *ECParameters_dup(EC_KEY *key);
  #define EVP_PKEY_CTX_set_ec_paramgen_curve_nid(ctx, nid) \
         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, EVP_PKEY_OP_PARAMGEN, \
                                 EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID, nid, NULL)