Manually expand ASN1_ITEM_rptr macros that should have been expanded with

the IMPLEMENT_ASN1_DUP_FUNCTION macro.

7 files changed, 15 insertions, 15 deletions

diff --git a/src/lib/libcrypto/asn1/x_algor.c b/src/lib/libcrypto/asn1/x_algor.c
index 63c4e028a6..7768c27eea 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.15 2015/02/10 04:21:50 jsing Exp $ */
+/* $OpenBSD: x_algor.c,v 1.16 2015/02/10 05:25:45 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -100,7 +100,7 @@ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_ALGORS, X509_ALGORS, X509_ALGORS)
 X509_ALGOR *
 X509_ALGOR_dup(X509_ALGOR *x)
 {
-        return ASN1_item_dup(ASN1_ITEM_rptr(X509_ALGOR), x);
+        return ASN1_item_dup(&X509_ALGOR_it, x);
 }
 
 IMPLEMENT_STACK_OF(X509_ALGOR)
diff --git a/src/lib/libcrypto/asn1/x_attrib.c b/src/lib/libcrypto/asn1/x_attrib.c
index 4306bd6240..9c00906ded 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.11 2015/02/10 04:21:50 jsing Exp $ */
+/* $OpenBSD: x_attrib.c,v 1.12 2015/02/10 05:25:45 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -122,7 +122,7 @@ X509_ATTRIBUTE_free(X509_ATTRIBUTE *a)
 X509_ATTRIBUTE *
 X509_ATTRIBUTE_dup(X509_ATTRIBUTE *x)
 {
-        return ASN1_item_dup(ASN1_ITEM_rptr(X509_ATTRIBUTE), x);
+        return ASN1_item_dup(&X509_ATTRIBUTE_it, x);
 }
 
 X509_ATTRIBUTE *
diff --git a/src/lib/libcrypto/asn1/x_crl.c b/src/lib/libcrypto/asn1/x_crl.c
index 9919d576e4..6e743b15ae 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.20 2015/02/10 04:21:50 jsing Exp $ */
+/* $OpenBSD: x_crl.c,v 1.21 2015/02/10 05:25:45 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -416,7 +416,7 @@ X509_CRL_free(X509_CRL *a)
 X509_CRL *
 X509_CRL_dup(X509_CRL *x)
 {
-        return ASN1_item_dup(ASN1_ITEM_rptr(X509_CRL), x);
+        return ASN1_item_dup(&X509_CRL_it, x);
 }
 
 static int
diff --git a/src/lib/libcrypto/asn1/x_exten.c b/src/lib/libcrypto/asn1/x_exten.c
index ad26a9e851..f0ec29ea4f 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.11 2015/02/10 04:21:50 jsing Exp $ */
+/* $OpenBSD: x_exten.c,v 1.12 2015/02/10 05:25:45 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -101,5 +101,5 @@ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(X509_EXTENSIONS, X509_EXTENSIONS, X509_EXT
 X509_EXTENSION *
 X509_EXTENSION_dup(X509_EXTENSION *x)
 {
-        return ASN1_item_dup(ASN1_ITEM_rptr(X509_EXTENSION), x);
+        return ASN1_item_dup(&X509_EXTENSION_it, x);
 }
diff --git a/src/lib/libcrypto/asn1/x_name.c b/src/lib/libcrypto/asn1/x_name.c
index d77702e473..3bcd172973 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.22 2015/02/10 04:21:50 jsing Exp $ */
+/* $OpenBSD: x_name.c,v 1.23 2015/02/10 05:25:45 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -121,7 +121,7 @@ X509_NAME_ENTRY_free(X509_NAME_ENTRY *a)
 X509_NAME_ENTRY *
 X509_NAME_ENTRY_dup(X509_NAME_ENTRY *x)
 {
-        return ASN1_item_dup(ASN1_ITEM_rptr(X509_NAME_ENTRY), x);
+        return ASN1_item_dup(&X509_NAME_ENTRY_it, x);
 }
 
 /* For the "Name" type we need a SEQUENCE OF { SET OF X509_NAME_ENTRY }
@@ -183,7 +183,7 @@ X509_NAME_free(X509_NAME *a)
 X509_NAME *
 X509_NAME_dup(X509_NAME *x)
 {
-        return ASN1_item_dup(ASN1_ITEM_rptr(X509_NAME), x);
+        return ASN1_item_dup(&X509_NAME_it, x);
 }
 
 static int
diff --git a/src/lib/libcrypto/asn1/x_req.c b/src/lib/libcrypto/asn1/x_req.c
index 42c7adb298..6ffcb9d03c 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.12 2015/02/10 04:21:50 jsing Exp $ */
+/* $OpenBSD: x_req.c,v 1.13 2015/02/10 05:25:45 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -163,5 +163,5 @@ X509_REQ_free(X509_REQ *a)
 X509_REQ *
 X509_REQ_dup(X509_REQ *x)
 {
-        return ASN1_item_dup(ASN1_ITEM_rptr(X509_REQ), x);
+        return ASN1_item_dup(&X509_REQ_it, x);
 }
diff --git a/src/lib/libcrypto/asn1/x_x509.c b/src/lib/libcrypto/asn1/x_x509.c
index a2778911cd..77ec8c41cf 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.19 2015/02/10 04:21:50 jsing Exp $ */
+/* $OpenBSD: x_x509.c,v 1.20 2015/02/10 05:25:45 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -191,7 +191,7 @@ X509_free(X509 *a)
 X509 *
 X509_dup(X509 *x)
 {
-        return ASN1_item_dup(ASN1_ITEM_rptr(X509), x);
+        return ASN1_item_dup(&X509_it, x);
 }
 
 int