7 files changed, 55 insertions, 15 deletions

diff --git a/src/lib/libcrypto/asn1/x_algor.c b/src/lib/libcrypto/asn1/x_algor.c
index 7d264f9fd3..63c4e028a6 100644
--- a/src/lib/libcrypto/asn1/x_algor.c
+++ b/src/lib/libcrypto/asn1/x_algor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_algor.c,v 1.14 2015/02/09 15:05:59 jsing Exp $ */
+/* $OpenBSD: x_algor.c,v 1.15 2015/02/10 04:21:50 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -96,7 +96,12 @@ X509_ALGOR_free(X509_ALGOR *a)
         ASN1_item_free((ASN1_VALUE *)a, &X509_ALGOR_it);
 }
 IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_ALGORS, X509_ALGORS, X509_ALGORS)
-IMPLEMENT_ASN1_DUP_FUNCTION(X509_ALGOR)
+
+X509_ALGOR *
+X509_ALGOR_dup(X509_ALGOR *x)
+{
+        return ASN1_item_dup(ASN1_ITEM_rptr(X509_ALGOR), x);
+}
 
 IMPLEMENT_STACK_OF(X509_ALGOR)
 IMPLEMENT_ASN1_SET_OF(X509_ALGOR)
diff --git a/src/lib/libcrypto/asn1/x_attrib.c b/src/lib/libcrypto/asn1/x_attrib.c
index aafd5dd485..4306bd6240 100644
--- a/src/lib/libcrypto/asn1/x_attrib.c
+++ b/src/lib/libcrypto/asn1/x_attrib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_attrib.c,v 1.10 2015/02/09 15:05:59 jsing Exp $ */
+/* $OpenBSD: x_attrib.c,v 1.11 2015/02/10 04:21:50 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -118,7 +118,12 @@ X509_ATTRIBUTE_free(X509_ATTRIBUTE *a)
 {
         ASN1_item_free((ASN1_VALUE *)a, &X509_ATTRIBUTE_it);
 }
-IMPLEMENT_ASN1_DUP_FUNCTION(X509_ATTRIBUTE)
+
+X509_ATTRIBUTE *
+X509_ATTRIBUTE_dup(X509_ATTRIBUTE *x)
+{
+        return ASN1_item_dup(ASN1_ITEM_rptr(X509_ATTRIBUTE), x);
+}
 
 X509_ATTRIBUTE *
 X509_ATTRIBUTE_create(int nid, int atrtype, void *value)
diff --git a/src/lib/libcrypto/asn1/x_crl.c b/src/lib/libcrypto/asn1/x_crl.c
index 2539fd92c4..9919d576e4 100644
--- a/src/lib/libcrypto/asn1/x_crl.c
+++ b/src/lib/libcrypto/asn1/x_crl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_crl.c,v 1.19 2015/02/09 15:05:59 jsing Exp $ */
+/* $OpenBSD: x_crl.c,v 1.20 2015/02/10 04:21:50 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -412,7 +412,12 @@ X509_CRL_free(X509_CRL *a)
 {
         ASN1_item_free((ASN1_VALUE *)a, &X509_CRL_it);
 }
-IMPLEMENT_ASN1_DUP_FUNCTION(X509_CRL)
+
+X509_CRL *
+X509_CRL_dup(X509_CRL *x)
+{
+        return ASN1_item_dup(ASN1_ITEM_rptr(X509_CRL), x);
+}
 
 static int
 X509_REVOKED_cmp(const X509_REVOKED * const *a, const X509_REVOKED * const *b)
diff --git a/src/lib/libcrypto/asn1/x_exten.c b/src/lib/libcrypto/asn1/x_exten.c
index 40c521ec80..ad26a9e851 100644
--- a/src/lib/libcrypto/asn1/x_exten.c
+++ b/src/lib/libcrypto/asn1/x_exten.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_exten.c,v 1.10 2015/02/09 15:05:59 jsing Exp $ */
+/* $OpenBSD: x_exten.c,v 1.11 2015/02/10 04:21:50 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -97,4 +97,9 @@ X509_EXTENSION_free(X509_EXTENSION *a)
         ASN1_item_free((ASN1_VALUE *)a, &X509_EXTENSION_it);
 }
 IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_EXTENSIONS, X509_EXTENSIONS, X509_EXTENSIONS)
-IMPLEMENT_ASN1_DUP_FUNCTION(X509_EXTENSION)
+
+X509_EXTENSION *
+X509_EXTENSION_dup(X509_EXTENSION *x)
+{
+        return ASN1_item_dup(ASN1_ITEM_rptr(X509_EXTENSION), x);
+}
diff --git a/src/lib/libcrypto/asn1/x_name.c b/src/lib/libcrypto/asn1/x_name.c
index a7f0e14d13..d77702e473 100644
--- a/src/lib/libcrypto/asn1/x_name.c
+++ b/src/lib/libcrypto/asn1/x_name.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_name.c,v 1.21 2015/02/09 15:05:59 jsing Exp $ */
+/* $OpenBSD: x_name.c,v 1.22 2015/02/10 04:21:50 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -117,7 +117,12 @@ X509_NAME_ENTRY_free(X509_NAME_ENTRY *a)
 {
         ASN1_item_free((ASN1_VALUE *)a, &X509_NAME_ENTRY_it);
 }
-IMPLEMENT_ASN1_DUP_FUNCTION(X509_NAME_ENTRY)
+
+X509_NAME_ENTRY *
+X509_NAME_ENTRY_dup(X509_NAME_ENTRY *x)
+{
+        return ASN1_item_dup(ASN1_ITEM_rptr(X509_NAME_ENTRY), x);
+}
 
 /* For the "Name" type we need a SEQUENCE OF { SET OF X509_NAME_ENTRY }
  * so declare two template wrappers for this
@@ -174,7 +179,12 @@ X509_NAME_free(X509_NAME *a)
 {
         ASN1_item_free((ASN1_VALUE *)a, &X509_NAME_it);
 }
-IMPLEMENT_ASN1_DUP_FUNCTION(X509_NAME)
+
+X509_NAME *
+X509_NAME_dup(X509_NAME *x)
+{
+        return ASN1_item_dup(ASN1_ITEM_rptr(X509_NAME), x);
+}
 
 static int
 x509_name_ex_new(ASN1_VALUE **val, const ASN1_ITEM *it)
diff --git a/src/lib/libcrypto/asn1/x_req.c b/src/lib/libcrypto/asn1/x_req.c
index 89b2d88d15..42c7adb298 100644
--- a/src/lib/libcrypto/asn1/x_req.c
+++ b/src/lib/libcrypto/asn1/x_req.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_req.c,v 1.11 2015/02/09 15:05:59 jsing Exp $ */
+/* $OpenBSD: x_req.c,v 1.12 2015/02/10 04:21:50 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -159,4 +159,9 @@ X509_REQ_free(X509_REQ *a)
 {
         ASN1_item_free((ASN1_VALUE *)a, &X509_REQ_it);
 }
-IMPLEMENT_ASN1_DUP_FUNCTION(X509_REQ)
+
+X509_REQ *
+X509_REQ_dup(X509_REQ *x)
+{
+        return ASN1_item_dup(ASN1_ITEM_rptr(X509_REQ), x);
+}
diff --git a/src/lib/libcrypto/asn1/x_x509.c b/src/lib/libcrypto/asn1/x_x509.c
index 8fd2d7684b..a2778911cd 100644
--- a/src/lib/libcrypto/asn1/x_x509.c
+++ b/src/lib/libcrypto/asn1/x_x509.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_x509.c,v 1.18 2015/02/09 15:05:59 jsing Exp $ */
+/* $OpenBSD: x_x509.c,v 1.19 2015/02/10 04:21:50 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -187,7 +187,12 @@ X509_free(X509 *a)
 {
         ASN1_item_free((ASN1_VALUE *)a, &X509_it);
 }
-IMPLEMENT_ASN1_DUP_FUNCTION(X509)
+
+X509 *
+X509_dup(X509 *x)
+{
+        return ASN1_item_dup(ASN1_ITEM_rptr(X509), x);
+}
 
 int
 X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,