From 839da8fff8567f7cd4ca2db04b35ff34048ddb4c Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Fri, 30 Dec 2016 15:38:13 +0000
Subject: Expand ASN1_ITEM_rptr macros - no change in generated assembly.

---
 src/lib/libcrypto/pkcs12/p12_utl.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/lib/libcrypto/pkcs12/p12_utl.c')

diff --git a/src/lib/libcrypto/pkcs12/p12_utl.c b/src/lib/libcrypto/pkcs12/p12_utl.c
index e02ff3073e..eb95417d1b 100644
--- a/src/lib/libcrypto/pkcs12/p12_utl.c
+++ b/src/lib/libcrypto/pkcs12/p12_utl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_utl.c,v 1.14 2016/12/30 15:08:22 jsing Exp $ */
+/* $OpenBSD: p12_utl.c,v 1.15 2016/12/30 15:34:35 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -127,38 +127,38 @@ OPENSSL_uni2asc(unsigned char *uni, int unilen)
 int
 i2d_PKCS12_bio(BIO *bp, PKCS12 *p12)
 {
-	return ASN1_item_i2d_bio(ASN1_ITEM_rptr(PKCS12), bp, p12);
+	return ASN1_item_i2d_bio(&PKCS12_it, bp, p12);
 }
 
 int
 i2d_PKCS12_fp(FILE *fp, PKCS12 *p12)
 {
-	return ASN1_item_i2d_fp(ASN1_ITEM_rptr(PKCS12), fp, p12);
+	return ASN1_item_i2d_fp(&PKCS12_it, fp, p12);
 }
 
 PKCS12 *
 d2i_PKCS12_bio(BIO *bp, PKCS12 **p12)
 {
-	return ASN1_item_d2i_bio(ASN1_ITEM_rptr(PKCS12), bp, p12);
+	return ASN1_item_d2i_bio(&PKCS12_it, bp, p12);
 }
 
 PKCS12 *
 d2i_PKCS12_fp(FILE *fp, PKCS12 **p12)
 {
-	    return ASN1_item_d2i_fp(ASN1_ITEM_rptr(PKCS12), fp, p12);
+	    return ASN1_item_d2i_fp(&PKCS12_it, fp, p12);
 }
 
 PKCS12_SAFEBAG *
 PKCS12_x5092certbag(X509 *x509)
 {
-	return PKCS12_item_pack_safebag(x509, ASN1_ITEM_rptr(X509),
+	return PKCS12_item_pack_safebag(x509, &X509_it,
 	    NID_x509Certificate, NID_certBag);
 }
 
 PKCS12_SAFEBAG *
 PKCS12_x509crl2certbag(X509_CRL *crl)
 {
-	return PKCS12_item_pack_safebag(crl, ASN1_ITEM_rptr(X509_CRL),
+	return PKCS12_item_pack_safebag(crl, &X509_CRL_it,
 	    NID_x509Crl, NID_crlBag);
 }
 
@@ -170,7 +170,7 @@ PKCS12_certbag2x509(PKCS12_SAFEBAG *bag)
 	if (OBJ_obj2nid(bag->value.bag->type) != NID_x509Certificate)
 		return NULL;
 	return ASN1_item_unpack(bag->value.bag->value.octet,
-	    ASN1_ITEM_rptr(X509));
+	    &X509_it);
 }
 
 X509_CRL *
@@ -181,5 +181,5 @@ PKCS12_certbag2x509crl(PKCS12_SAFEBAG *bag)
 	if (OBJ_obj2nid(bag->value.bag->type) != NID_x509Crl)
 		return NULL;
 	return ASN1_item_unpack(bag->value.bag->value.octet,
-	    ASN1_ITEM_rptr(X509_CRL));
+	    &X509_CRL_it);
 }
-- 
cgit v1.2.3-55-g6feb