Kill a bunch of OLD_ASN1 usage by replacing ASN1_{d2i,i2d}_* with

ASN1_item_{d2i,i2d}_* equivalents.

ok guenther@ miod@

1 files changed, 17 insertions, 21 deletions

diff --git a/src/lib/libcrypto/ts/ts_asn1.c b/src/lib/libcrypto/ts/ts_asn1.c
index 1386483247..49232d8073 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.9 2015/07/24 15:25:44 jsing Exp $ */
+/* $OpenBSD: ts_asn1.c,v 1.10 2016/11/04 18:35:30 jsing Exp $ */
 /* Written by Nils Larsch for the OpenSSL project 2004.
  */
 /* ====================================================================
@@ -124,28 +124,26 @@ TS_MSG_IMPRINT_dup(TS_MSG_IMPRINT *x)
 TS_MSG_IMPRINT *
 d2i_TS_MSG_IMPRINT_bio(BIO *bp, TS_MSG_IMPRINT **a)
 {
-        return ASN1_d2i_bio_of(TS_MSG_IMPRINT, TS_MSG_IMPRINT_new,
-            d2i_TS_MSG_IMPRINT, bp, a);
+        return ASN1_item_d2i_bio(&TS_MSG_IMPRINT_it, bp, a);
 }
 
 int
 i2d_TS_MSG_IMPRINT_bio(BIO *bp, TS_MSG_IMPRINT *a)
 {
-        return ASN1_i2d_bio_of_const(TS_MSG_IMPRINT, i2d_TS_MSG_IMPRINT, bp, a);
+        return ASN1_item_i2d_bio(&TS_MSG_IMPRINT_it, bp, a);
 }
 #endif
 
 TS_MSG_IMPRINT *
 d2i_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT **a)
 {
-        return ASN1_d2i_fp_of(TS_MSG_IMPRINT, TS_MSG_IMPRINT_new,
-            d2i_TS_MSG_IMPRINT, fp, a);
+        return ASN1_item_d2i_fp(&TS_MSG_IMPRINT_it, fp, a);
 }
 
 int
 i2d_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT *a)
 {
-        return ASN1_i2d_fp_of_const(TS_MSG_IMPRINT, i2d_TS_MSG_IMPRINT, fp, a);
+        return ASN1_item_i2d_fp(&TS_MSG_IMPRINT_it, fp, a);
 }
 
 static const ASN1_TEMPLATE TS_REQ_seq_tt[] = {
@@ -239,26 +237,26 @@ TS_REQ_dup(TS_REQ *x)
 TS_REQ *
 d2i_TS_REQ_bio(BIO *bp, TS_REQ **a)
 {
-        return ASN1_d2i_bio_of(TS_REQ, TS_REQ_new, d2i_TS_REQ, bp, a);
+        return ASN1_item_d2i_bio(&TS_REQ_it, bp, a);
 }
 
 int
 i2d_TS_REQ_bio(BIO *bp, TS_REQ *a)
 {
-        return ASN1_i2d_bio_of_const(TS_REQ, i2d_TS_REQ, bp, a);
+        return ASN1_item_i2d_bio(&TS_REQ_it, bp, a);
 }
 #endif
 
 TS_REQ *
 d2i_TS_REQ_fp(FILE *fp, TS_REQ **a)
 {
-        return ASN1_d2i_fp_of(TS_REQ, TS_REQ_new, d2i_TS_REQ, fp, a);
+        return ASN1_item_d2i_fp(&TS_REQ_it, fp, a);
 }
 
 int
 i2d_TS_REQ_fp(FILE *fp, TS_REQ *a)
 {
-        return ASN1_i2d_fp_of_const(TS_REQ, i2d_TS_REQ, fp, a);
+        return ASN1_item_i2d_fp(&TS_REQ_it, fp, a);
 }
 
 static const ASN1_TEMPLATE TS_ACCURACY_seq_tt[] = {
@@ -446,28 +444,26 @@ TS_TST_INFO_dup(TS_TST_INFO *x)
 TS_TST_INFO *
 d2i_TS_TST_INFO_bio(BIO *bp, TS_TST_INFO **a)
 {
-        return ASN1_d2i_bio_of(TS_TST_INFO, TS_TST_INFO_new, d2i_TS_TST_INFO,
-            bp, a);
+        return ASN1_item_d2i_bio(&TS_TST_INFO_it, bp, a);
 }
 
 int
 i2d_TS_TST_INFO_bio(BIO *bp, TS_TST_INFO *a)
 {
-        return ASN1_i2d_bio_of_const(TS_TST_INFO, i2d_TS_TST_INFO, bp, a);
+        return ASN1_item_i2d_bio(&TS_TST_INFO_it, bp, a);
 }
 #endif
 
 TS_TST_INFO *
 d2i_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO **a)
 {
-        return ASN1_d2i_fp_of(TS_TST_INFO, TS_TST_INFO_new, d2i_TS_TST_INFO,
-            fp, a);
+        return ASN1_item_d2i_fp(&TS_TST_INFO_it, fp, a);
 }
 
 int
 i2d_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO *a)
 {
-        return ASN1_i2d_fp_of_const(TS_TST_INFO, i2d_TS_TST_INFO, fp, a);
+        return ASN1_item_i2d_fp(&TS_TST_INFO_it, fp, a);
 }
 
 static const ASN1_TEMPLATE TS_STATUS_INFO_seq_tt[] = {
@@ -652,26 +648,26 @@ TS_RESP_dup(TS_RESP *x)
 TS_RESP *
 d2i_TS_RESP_bio(BIO *bp, TS_RESP **a)
 {
-        return ASN1_d2i_bio_of(TS_RESP, TS_RESP_new, d2i_TS_RESP, bp, a);
+        return ASN1_item_d2i_bio(&TS_RESP_it, bp, a);
 }
 
 int
 i2d_TS_RESP_bio(BIO *bp, TS_RESP *a)
 {
-        return ASN1_i2d_bio_of_const(TS_RESP, i2d_TS_RESP, bp, a);
+        return ASN1_item_i2d_bio(&TS_RESP_it, bp, a);
 }
 #endif
 
 TS_RESP *
 d2i_TS_RESP_fp(FILE *fp, TS_RESP **a)
 {
-        return ASN1_d2i_fp_of(TS_RESP, TS_RESP_new, d2i_TS_RESP, fp, a);
+        return ASN1_item_d2i_fp(&TS_RESP_it, fp, a);
 }
 
 int
 i2d_TS_RESP_fp(FILE *fp, TS_RESP *a)
 {
-        return ASN1_i2d_fp_of_const(TS_RESP, i2d_TS_RESP, fp, a);
+        return ASN1_item_i2d_fp(&TS_RESP_it, fp, a);
 }
 
 static const ASN1_TEMPLATE ESS_ISSUER_SERIAL_seq_tt[] = {