Use ASN1_item_dup() instead of ASN1_dup().

ok bcook@

4 files changed, 10 insertions, 14 deletions

diff --git a/src/lib/libcrypto/ocsp/ocsp.h b/src/lib/libcrypto/ocsp/ocsp.h
index b7e3115e8d..eb65309981 100644
--- a/src/lib/libcrypto/ocsp/ocsp.h
+++ b/src/lib/libcrypto/ocsp/ocsp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ocsp.h,v 1.6 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: ocsp.h,v 1.7 2015/09/26 17:38:41 jsing Exp $ */
 /* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL
  * project. */
 
@@ -388,9 +388,8 @@ typedef struct ocsp_service_locator_st {
 #define ASN1_BIT_STRING_digest(data,type,md,len) \
     ASN1_item_digest(ASN1_ITEM_rptr(ASN1_BIT_STRING),type,data,md,len)
 
-#define OCSP_CERTSTATUS_dup(cs)\
-    (OCSP_CERTSTATUS*)ASN1_dup((int(*)())i2d_OCSP_CERTSTATUS,\
-        (char *(*)())d2i_OCSP_CERTSTATUS,(char *)(cs))
+#define OCSP_CERTSTATUS_dup(cs) \
+        ASN1_item_dup(&OCSP_CERTSTATUS_it, cs)
 
 OCSP_CERTID *OCSP_CERTID_dup(OCSP_CERTID *id);
 
diff --git a/src/lib/libcrypto/x509v3/v3_genn.c b/src/lib/libcrypto/x509v3/v3_genn.c
index 9943fd33d2..a6b7a18b17 100644
--- a/src/lib/libcrypto/x509v3/v3_genn.c
+++ b/src/lib/libcrypto/x509v3/v3_genn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_genn.c,v 1.11 2015/07/25 16:00:14 jsing Exp $ */
+/* $OpenBSD: v3_genn.c,v 1.12 2015/09/26 17:38:41 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -321,8 +321,7 @@ GENERAL_NAMES_free(GENERAL_NAMES *a)
 GENERAL_NAME *
 GENERAL_NAME_dup(GENERAL_NAME *a)
 {
-        return (GENERAL_NAME *)ASN1_dup((i2d_of_void *)i2d_GENERAL_NAME,
-            (d2i_of_void *)d2i_GENERAL_NAME, (char *)a);
+        return ASN1_item_dup(&GENERAL_NAME_it, a);
 }
 
 /* Returns 0 if they are equal, != 0 otherwise. */
diff --git a/src/lib/libssl/src/crypto/ocsp/ocsp.h b/src/lib/libssl/src/crypto/ocsp/ocsp.h
index b7e3115e8d..eb65309981 100644
--- a/src/lib/libssl/src/crypto/ocsp/ocsp.h
+++ b/src/lib/libssl/src/crypto/ocsp/ocsp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ocsp.h,v 1.6 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: ocsp.h,v 1.7 2015/09/26 17:38:41 jsing Exp $ */
 /* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL
  * project. */
 
@@ -388,9 +388,8 @@ typedef struct ocsp_service_locator_st {
 #define ASN1_BIT_STRING_digest(data,type,md,len) \
     ASN1_item_digest(ASN1_ITEM_rptr(ASN1_BIT_STRING),type,data,md,len)
 
-#define OCSP_CERTSTATUS_dup(cs)\
-    (OCSP_CERTSTATUS*)ASN1_dup((int(*)())i2d_OCSP_CERTSTATUS,\
-        (char *(*)())d2i_OCSP_CERTSTATUS,(char *)(cs))
+#define OCSP_CERTSTATUS_dup(cs) \
+        ASN1_item_dup(&OCSP_CERTSTATUS_it, cs)
 
 OCSP_CERTID *OCSP_CERTID_dup(OCSP_CERTID *id);
 
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_genn.c b/src/lib/libssl/src/crypto/x509v3/v3_genn.c
index 9943fd33d2..a6b7a18b17 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_genn.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_genn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_genn.c,v 1.11 2015/07/25 16:00:14 jsing Exp $ */
+/* $OpenBSD: v3_genn.c,v 1.12 2015/09/26 17:38:41 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -321,8 +321,7 @@ GENERAL_NAMES_free(GENERAL_NAMES *a)
 GENERAL_NAME *
 GENERAL_NAME_dup(GENERAL_NAME *a)
 {
-        return (GENERAL_NAME *)ASN1_dup((i2d_of_void *)i2d_GENERAL_NAME,
-            (d2i_of_void *)d2i_GENERAL_NAME, (char *)a);
+        return ASN1_item_dup(&GENERAL_NAME_it, a);
 }
 
 /* Returns 0 if they are equal, != 0 otherwise. */