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

ASN1_item_{d2i,i2d}_* equivalents.

ok guenther@ miod@

2 files changed, 30 insertions, 15 deletions

diff --git a/src/lib/libcrypto/ocsp/ocsp.h b/src/lib/libcrypto/ocsp/ocsp.h
index 90f0edf289..24592bc3cc 100644
--- a/src/lib/libcrypto/ocsp/ocsp.h
+++ b/src/lib/libcrypto/ocsp/ocsp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ocsp.h,v 1.8 2016/09/04 17:18:18 jsing Exp $ */
+/* $OpenBSD: ocsp.h,v 1.9 2016/11/04 18:35:30 jsing Exp $ */
 /* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL
  * project. */
 
@@ -343,12 +343,6 @@ typedef struct ocsp_service_locator_st {
 #define PEM_STRING_OCSP_REQUEST "OCSP REQUEST"
 #define PEM_STRING_OCSP_RESPONSE "OCSP RESPONSE"
 
-#define d2i_OCSP_REQUEST_bio(bp,p) \
-    ASN1_d2i_bio_of(OCSP_REQUEST,OCSP_REQUEST_new,d2i_OCSP_REQUEST,bp,p)
-
-#define d2i_OCSP_RESPONSE_bio(bp,p) \
-    ASN1_d2i_bio_of(OCSP_RESPONSE,OCSP_RESPONSE_new,d2i_OCSP_RESPONSE,bp,p)
-
 #define PEM_read_bio_OCSP_REQUEST(bp,x,cb) \
     (OCSP_REQUEST *)PEM_ASN1_read_bio((char *(*)())d2i_OCSP_REQUEST, \
         PEM_STRING_OCSP_REQUEST,bp,(char **)x,cb,NULL)
@@ -365,12 +359,6 @@ typedef struct ocsp_service_locator_st {
     PEM_ASN1_write_bio((int (*)())i2d_OCSP_RESPONSE,PEM_STRING_OCSP_RESPONSE,\
         bp,(char *)o, NULL,NULL,0,NULL,NULL)
 
-#define i2d_OCSP_RESPONSE_bio(bp,o) \
-    ASN1_i2d_bio_of(OCSP_RESPONSE,i2d_OCSP_RESPONSE,bp,o)
-
-#define i2d_OCSP_REQUEST_bio(bp,o) \
-    ASN1_i2d_bio_of(OCSP_REQUEST,i2d_OCSP_REQUEST,bp,o)
-
 #define OCSP_REQUEST_sign(o,pkey,md) \
     ASN1_item_sign(ASN1_ITEM_rptr(OCSP_REQINFO), \
         o->optionalSignature->signatureAlgorithm,NULL, \
@@ -560,6 +548,8 @@ OCSP_RESPONSE *OCSP_RESPONSE_new(void);
 void OCSP_RESPONSE_free(OCSP_RESPONSE *a);
 OCSP_RESPONSE *d2i_OCSP_RESPONSE(OCSP_RESPONSE **a, const unsigned char **in, long len);
 int i2d_OCSP_RESPONSE(OCSP_RESPONSE *a, unsigned char **out);
+OCSP_RESPONSE *d2i_OCSP_RESPONSE_bio(BIO *bp, OCSP_RESPONSE **a);
+int i2d_OCSP_RESPONSE_bio(BIO *bp, OCSP_RESPONSE *a);
 extern const ASN1_ITEM OCSP_RESPONSE_it;
 OCSP_RESPBYTES *OCSP_RESPBYTES_new(void);
 void OCSP_RESPBYTES_free(OCSP_RESPBYTES *a);
@@ -580,6 +570,8 @@ OCSP_REQUEST *OCSP_REQUEST_new(void);
 void OCSP_REQUEST_free(OCSP_REQUEST *a);
 OCSP_REQUEST *d2i_OCSP_REQUEST(OCSP_REQUEST **a, const unsigned char **in, long len);
 int i2d_OCSP_REQUEST(OCSP_REQUEST *a, unsigned char **out);
+OCSP_REQUEST *d2i_OCSP_REQUEST_bio(BIO *bp, OCSP_REQUEST **a);
+int i2d_OCSP_REQUEST_bio(BIO *bp, OCSP_REQUEST *a);
 extern const ASN1_ITEM OCSP_REQUEST_it;
 OCSP_SIGNATURE *OCSP_SIGNATURE_new(void);
 void OCSP_SIGNATURE_free(OCSP_SIGNATURE *a);
diff --git a/src/lib/libcrypto/ocsp/ocsp_asn.c b/src/lib/libcrypto/ocsp/ocsp_asn.c
index 72e7638c75..bb58ca79ab 100644
--- a/src/lib/libcrypto/ocsp/ocsp_asn.c
+++ b/src/lib/libcrypto/ocsp/ocsp_asn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ocsp_asn.c,v 1.8 2015/07/25 14:52:47 jsing Exp $ */
+/* $OpenBSD: ocsp_asn.c,v 1.9 2016/11/04 18:35:30 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -333,7 +333,6 @@ const ASN1_ITEM OCSP_REQUEST_it = {
         .sname = "OCSP_REQUEST",
 };
 
-
 OCSP_REQUEST *
 d2i_OCSP_REQUEST(OCSP_REQUEST **a, const unsigned char **in, long len)
 {
@@ -348,6 +347,18 @@ i2d_OCSP_REQUEST(OCSP_REQUEST *a, unsigned char **out)
 }
 
 OCSP_REQUEST *
+d2i_OCSP_REQUEST_bio(BIO *bp, OCSP_REQUEST **a)
+{
+        return ASN1_item_d2i_bio(&OCSP_REQUEST_it, bp, a);
+}
+
+int
+i2d_OCSP_REQUEST_bio(BIO *bp, OCSP_REQUEST *a)
+{
+        return ASN1_item_i2d_bio(&OCSP_REQUEST_it, bp, a);
+}
+
+OCSP_REQUEST *
 OCSP_REQUEST_new(void)
 {
         return (OCSP_REQUEST *)ASN1_item_new(&OCSP_REQUEST_it);
@@ -456,6 +467,18 @@ i2d_OCSP_RESPONSE(OCSP_RESPONSE *a, unsigned char **out)
 }
 
 OCSP_RESPONSE *
+d2i_OCSP_RESPONSE_bio(BIO *bp, OCSP_RESPONSE **a)
+{
+        return ASN1_item_d2i_bio(&OCSP_RESPONSE_it, bp, a);
+}
+
+int
+i2d_OCSP_RESPONSE_bio(BIO *bp, OCSP_RESPONSE *a)
+{
+        return ASN1_item_i2d_bio(&OCSP_RESPONSE_it, bp, a);
+}
+
+OCSP_RESPONSE *
 OCSP_RESPONSE_new(void)
 {
         return (OCSP_RESPONSE *)ASN1_item_new(&OCSP_RESPONSE_it);