From 2eecb536a9b8f1c8c2ea5f485be1748d475a131c Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Tue, 10 Feb 2015 05:25:45 +0000
Subject: Manually expand ASN1_ITEM_rptr macros that should have been expanded
 with the IMPLEMENT_ASN1_DUP_FUNCTION macro.

---
 src/lib/libcrypto/ts/ts_asn1.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/lib/libcrypto/ts')

diff --git a/src/lib/libcrypto/ts/ts_asn1.c b/src/lib/libcrypto/ts/ts_asn1.c
index 888f8e3d98..d85f3690c0 100644
--- a/src/lib/libcrypto/ts/ts_asn1.c
+++ b/src/lib/libcrypto/ts/ts_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts_asn1.c,v 1.7 2015/02/10 04:21:50 jsing Exp $ */
+/* $OpenBSD: ts_asn1.c,v 1.8 2015/02/10 05:25:45 jsing Exp $ */
 /* Written by Nils Larsch for the OpenSSL project 2004.
  */
 /* ====================================================================
@@ -95,7 +95,7 @@ TS_MSG_IMPRINT_free(TS_MSG_IMPRINT *a)
 TS_MSG_IMPRINT *
 TS_MSG_IMPRINT_dup(TS_MSG_IMPRINT *x)
 {
-	return ASN1_item_dup(ASN1_ITEM_rptr(TS_MSG_IMPRINT), x);
+	return ASN1_item_dup(&TS_MSG_IMPRINT_it, x);
 }
 
 #ifndef OPENSSL_NO_BIO
@@ -164,7 +164,7 @@ TS_REQ_free(TS_REQ *a)
 TS_REQ *
 TS_REQ_dup(TS_REQ *x)
 {
-	return ASN1_item_dup(ASN1_ITEM_rptr(TS_REQ), x);
+	return ASN1_item_dup(&TS_REQ_it, x);
 }
 
 #ifndef OPENSSL_NO_BIO
@@ -228,7 +228,7 @@ TS_ACCURACY_free(TS_ACCURACY *a)
 TS_ACCURACY *
 TS_ACCURACY_dup(TS_ACCURACY *x)
 {
-	return ASN1_item_dup(ASN1_ITEM_rptr(TS_ACCURACY), x);
+	return ASN1_item_dup(&TS_ACCURACY_it, x);
 }
 
 ASN1_SEQUENCE(TS_TST_INFO) = {
@@ -273,7 +273,7 @@ TS_TST_INFO_free(TS_TST_INFO *a)
 TS_TST_INFO *
 TS_TST_INFO_dup(TS_TST_INFO *x)
 {
-	return ASN1_item_dup(ASN1_ITEM_rptr(TS_TST_INFO), x);
+	return ASN1_item_dup(&TS_TST_INFO_it, x);
 }
 
 #ifndef OPENSSL_NO_BIO
@@ -339,7 +339,7 @@ TS_STATUS_INFO_free(TS_STATUS_INFO *a)
 TS_STATUS_INFO *
 TS_STATUS_INFO_dup(TS_STATUS_INFO *x)
 {
-	return ASN1_item_dup(ASN1_ITEM_rptr(TS_STATUS_INFO), x);
+	return ASN1_item_dup(&TS_STATUS_INFO_it, x);
 }
 
 static int
@@ -421,7 +421,7 @@ TS_RESP_free(TS_RESP *a)
 TS_RESP *
 TS_RESP_dup(TS_RESP *x)
 {
-	return ASN1_item_dup(ASN1_ITEM_rptr(TS_RESP), x);
+	return ASN1_item_dup(&TS_RESP_it, x);
 }
 
 #ifndef OPENSSL_NO_BIO
@@ -484,7 +484,7 @@ ESS_ISSUER_SERIAL_free(ESS_ISSUER_SERIAL *a)
 ESS_ISSUER_SERIAL *
 ESS_ISSUER_SERIAL_dup(ESS_ISSUER_SERIAL *x)
 {
-	return ASN1_item_dup(ASN1_ITEM_rptr(ESS_ISSUER_SERIAL), x);
+	return ASN1_item_dup(&ESS_ISSUER_SERIAL_it, x);
 }
 
 ASN1_SEQUENCE(ESS_CERT_ID) = {
@@ -521,7 +521,7 @@ ESS_CERT_ID_free(ESS_CERT_ID *a)
 ESS_CERT_ID *
 ESS_CERT_ID_dup(ESS_CERT_ID *x)
 {
-	return ASN1_item_dup(ASN1_ITEM_rptr(ESS_CERT_ID), x);
+	return ASN1_item_dup(&ESS_CERT_ID_it, x);
 }
 
 ASN1_SEQUENCE(ESS_SIGNING_CERT) = {
@@ -558,7 +558,7 @@ ESS_SIGNING_CERT_free(ESS_SIGNING_CERT *a)
 ESS_SIGNING_CERT *
 ESS_SIGNING_CERT_dup(ESS_SIGNING_CERT *x)
 {
-	return ASN1_item_dup(ASN1_ITEM_rptr(ESS_SIGNING_CERT), x);
+	return ASN1_item_dup(&ESS_SIGNING_CERT_it, x);
 }
 
 /* Getting encapsulated TS_TST_INFO object from PKCS7. */
-- 
cgit v1.2.3-55-g6feb