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

ASN1_item_{d2i,i2d}_* equivalents.

ok guenther@ miod@

1 files changed, 25 insertions, 2 deletions

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);