From 9bd525742fa9bbaf8f56cda1167eb91c447404a5 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Tue, 10 Feb 2015 04:21:50 +0000
Subject: Expand the IMPLEMENT_ASN1_DUP_FUNCTION macro so that the code is
 visible and functions can be readily located.

Change has been scripted and the generated assembly only differs by changes
to line numbers.

Discussed with beck@ miod@ tedu@
---
 src/lib/libcrypto/ts/ts_asn1.c | 65 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 55 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 3ef882cf05..888f8e3d98 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.6 2015/02/10 04:01:26 jsing Exp $ */
+/* $OpenBSD: ts_asn1.c,v 1.7 2015/02/10 04:21:50 jsing Exp $ */
 /* Written by Nils Larsch for the OpenSSL project 2004.
  */
 /* ====================================================================
@@ -91,7 +91,12 @@ TS_MSG_IMPRINT_free(TS_MSG_IMPRINT *a)
 {
 	ASN1_item_free((ASN1_VALUE *)a, &TS_MSG_IMPRINT_it);
 }
-IMPLEMENT_ASN1_DUP_FUNCTION(TS_MSG_IMPRINT)
+
+TS_MSG_IMPRINT *
+TS_MSG_IMPRINT_dup(TS_MSG_IMPRINT *x)
+{
+	return ASN1_item_dup(ASN1_ITEM_rptr(TS_MSG_IMPRINT), x);
+}
 
 #ifndef OPENSSL_NO_BIO
 TS_MSG_IMPRINT *
@@ -155,7 +160,12 @@ TS_REQ_free(TS_REQ *a)
 {
 	ASN1_item_free((ASN1_VALUE *)a, &TS_REQ_it);
 }
-IMPLEMENT_ASN1_DUP_FUNCTION(TS_REQ)
+
+TS_REQ *
+TS_REQ_dup(TS_REQ *x)
+{
+	return ASN1_item_dup(ASN1_ITEM_rptr(TS_REQ), x);
+}
 
 #ifndef OPENSSL_NO_BIO
 TS_REQ *
@@ -214,7 +224,12 @@ TS_ACCURACY_free(TS_ACCURACY *a)
 {
 	ASN1_item_free((ASN1_VALUE *)a, &TS_ACCURACY_it);
 }
-IMPLEMENT_ASN1_DUP_FUNCTION(TS_ACCURACY)
+
+TS_ACCURACY *
+TS_ACCURACY_dup(TS_ACCURACY *x)
+{
+	return ASN1_item_dup(ASN1_ITEM_rptr(TS_ACCURACY), x);
+}
 
 ASN1_SEQUENCE(TS_TST_INFO) = {
 	ASN1_SIMPLE(TS_TST_INFO, version, ASN1_INTEGER),
@@ -254,7 +269,12 @@ TS_TST_INFO_free(TS_TST_INFO *a)
 {
 	ASN1_item_free((ASN1_VALUE *)a, &TS_TST_INFO_it);
 }
-IMPLEMENT_ASN1_DUP_FUNCTION(TS_TST_INFO)
+
+TS_TST_INFO *
+TS_TST_INFO_dup(TS_TST_INFO *x)
+{
+	return ASN1_item_dup(ASN1_ITEM_rptr(TS_TST_INFO), x);
+}
 
 #ifndef OPENSSL_NO_BIO
 TS_TST_INFO *
@@ -315,7 +335,12 @@ TS_STATUS_INFO_free(TS_STATUS_INFO *a)
 {
 	ASN1_item_free((ASN1_VALUE *)a, &TS_STATUS_INFO_it);
 }
-IMPLEMENT_ASN1_DUP_FUNCTION(TS_STATUS_INFO)
+
+TS_STATUS_INFO *
+TS_STATUS_INFO_dup(TS_STATUS_INFO *x)
+{
+	return ASN1_item_dup(ASN1_ITEM_rptr(TS_STATUS_INFO), x);
+}
 
 static int
 ts_resp_set_tst_info(TS_RESP *a)
@@ -392,7 +417,12 @@ TS_RESP_free(TS_RESP *a)
 {
 	ASN1_item_free((ASN1_VALUE *)a, &TS_RESP_it);
 }
-IMPLEMENT_ASN1_DUP_FUNCTION(TS_RESP)
+
+TS_RESP *
+TS_RESP_dup(TS_RESP *x)
+{
+	return ASN1_item_dup(ASN1_ITEM_rptr(TS_RESP), x);
+}
 
 #ifndef OPENSSL_NO_BIO
 TS_RESP *
@@ -450,7 +480,12 @@ ESS_ISSUER_SERIAL_free(ESS_ISSUER_SERIAL *a)
 {
 	ASN1_item_free((ASN1_VALUE *)a, &ESS_ISSUER_SERIAL_it);
 }
-IMPLEMENT_ASN1_DUP_FUNCTION(ESS_ISSUER_SERIAL)
+
+ESS_ISSUER_SERIAL *
+ESS_ISSUER_SERIAL_dup(ESS_ISSUER_SERIAL *x)
+{
+	return ASN1_item_dup(ASN1_ITEM_rptr(ESS_ISSUER_SERIAL), x);
+}
 
 ASN1_SEQUENCE(ESS_CERT_ID) = {
 	ASN1_SIMPLE(ESS_CERT_ID, hash, ASN1_OCTET_STRING),
@@ -482,7 +517,12 @@ ESS_CERT_ID_free(ESS_CERT_ID *a)
 {
 	ASN1_item_free((ASN1_VALUE *)a, &ESS_CERT_ID_it);
 }
-IMPLEMENT_ASN1_DUP_FUNCTION(ESS_CERT_ID)
+
+ESS_CERT_ID *
+ESS_CERT_ID_dup(ESS_CERT_ID *x)
+{
+	return ASN1_item_dup(ASN1_ITEM_rptr(ESS_CERT_ID), x);
+}
 
 ASN1_SEQUENCE(ESS_SIGNING_CERT) = {
 	ASN1_SEQUENCE_OF(ESS_SIGNING_CERT, cert_ids, ESS_CERT_ID),
@@ -514,7 +554,12 @@ ESS_SIGNING_CERT_free(ESS_SIGNING_CERT *a)
 {
 	ASN1_item_free((ASN1_VALUE *)a, &ESS_SIGNING_CERT_it);
 }
-IMPLEMENT_ASN1_DUP_FUNCTION(ESS_SIGNING_CERT)
+
+ESS_SIGNING_CERT *
+ESS_SIGNING_CERT_dup(ESS_SIGNING_CERT *x)
+{
+	return ASN1_item_dup(ASN1_ITEM_rptr(ESS_SIGNING_CERT), x);
+}
 
 /* Getting encapsulated TS_TST_INFO object from PKCS7. */
 TS_TST_INFO *
-- 
cgit v1.2.3-55-g6feb