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/pkcs7/bio_pk7.c  |  4 ++--
 src/lib/libcrypto/pkcs7/pk7_attr.c |  6 +++---
 src/lib/libcrypto/pkcs7/pk7_doit.c |  6 +++---
 src/lib/libcrypto/pkcs7/pk7_mime.c | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/lib/libcrypto/pkcs7')

diff --git a/src/lib/libcrypto/pkcs7/bio_pk7.c b/src/lib/libcrypto/pkcs7/bio_pk7.c
index 0e4a4f7559..ad3c5e2698 100644
--- a/src/lib/libcrypto/pkcs7/bio_pk7.c
+++ b/src/lib/libcrypto/pkcs7/bio_pk7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio_pk7.c,v 1.4 2014/06/29 17:05:36 jsing Exp $ */
+/* $OpenBSD: bio_pk7.c,v 1.5 2016/12/30 15:38:13 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -62,5 +62,5 @@
 BIO *
 BIO_new_PKCS7(BIO *out, PKCS7 *p7)
 {
-	return BIO_new_NDEF(out, (ASN1_VALUE *)p7, ASN1_ITEM_rptr(PKCS7));
+	return BIO_new_NDEF(out, (ASN1_VALUE *)p7, &PKCS7_it);
 }
diff --git a/src/lib/libcrypto/pkcs7/pk7_attr.c b/src/lib/libcrypto/pkcs7/pk7_attr.c
index 554a47673b..07722f98e1 100644
--- a/src/lib/libcrypto/pkcs7/pk7_attr.c
+++ b/src/lib/libcrypto/pkcs7/pk7_attr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pk7_attr.c,v 1.10 2014/10/28 05:46:56 miod Exp $ */
+/* $OpenBSD: pk7_attr.c,v 1.11 2016/12/30 15:38:13 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -76,7 +76,7 @@ PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si, STACK_OF(X509_ALGOR) *cap)
 		return 0;
 	}
 	seq->length = ASN1_item_i2d((ASN1_VALUE *)cap, &seq->data,
-	    ASN1_ITEM_rptr(X509_ALGORS));
+	    &X509_ALGORS_it);
 	return PKCS7_add_signed_attribute(si, NID_SMIMECapabilities,
 	    V_ASN1_SEQUENCE, seq);
 }
@@ -93,7 +93,7 @@ PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si)
 	p = cap->value.sequence->data;
 	return (STACK_OF(X509_ALGOR) *)
 	ASN1_item_d2i(NULL, &p, cap->value.sequence->length,
-	    ASN1_ITEM_rptr(X509_ALGORS));
+	    &X509_ALGORS_it);
 }
 
 /* Basic smime-capabilities OID and optional integer arg */
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c
index bd873143c1..e84eee6d8f 100644
--- a/src/lib/libcrypto/pkcs7/pk7_doit.c
+++ b/src/lib/libcrypto/pkcs7/pk7_doit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pk7_doit.c,v 1.39 2016/11/05 15:19:07 miod Exp $ */
+/* $OpenBSD: pk7_doit.c,v 1.40 2016/12/30 15:38:13 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -915,7 +915,7 @@ PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
 	}
 
 	alen = ASN1_item_i2d((ASN1_VALUE *)si->auth_attr, &abuf,
-	    ASN1_ITEM_rptr(PKCS7_ATTR_SIGN));
+	    &PKCS7_ATTR_SIGN_it);
 	if (!abuf)
 		goto err;
 	if (EVP_DigestSignUpdate(&mctx, abuf, alen) <= 0)
@@ -1090,7 +1090,7 @@ PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si, X509 *x509)
 			goto err;
 
 		alen = ASN1_item_i2d((ASN1_VALUE *)sk, &abuf,
-		    ASN1_ITEM_rptr(PKCS7_ATTR_VERIFY));
+		    &PKCS7_ATTR_VERIFY_it);
 		if (alen <= 0) {
 			PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, ERR_R_ASN1_LIB);
 			ret = -1;
diff --git a/src/lib/libcrypto/pkcs7/pk7_mime.c b/src/lib/libcrypto/pkcs7/pk7_mime.c
index 31023f22c6..fad331bf16 100644
--- a/src/lib/libcrypto/pkcs7/pk7_mime.c
+++ b/src/lib/libcrypto/pkcs7/pk7_mime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pk7_mime.c,v 1.12 2014/10/18 17:20:40 jsing Exp $ */
+/* $OpenBSD: pk7_mime.c,v 1.13 2016/12/30 15:38:13 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -64,14 +64,14 @@ int
 i2d_PKCS7_bio_stream(BIO *out, PKCS7 *p7, BIO *in, int flags)
 {
 	return i2d_ASN1_bio_stream(out, (ASN1_VALUE *)p7, in, flags,
-	    ASN1_ITEM_rptr(PKCS7));
+	    &PKCS7_it);
 }
 
 int
 PEM_write_bio_PKCS7_stream(BIO *out, PKCS7 *p7, BIO *in, int flags)
 {
 	return PEM_write_bio_ASN1_stream(out, (ASN1_VALUE *) p7, in, flags,
-	    "PKCS7", ASN1_ITEM_rptr(PKCS7));
+	    "PKCS7", &PKCS7_it);
 }
 
 int
@@ -88,11 +88,11 @@ SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags)
 
 
 	return SMIME_write_ASN1(bio, (ASN1_VALUE *)p7, data, flags,
-	    ctype_nid, NID_undef, mdalgs, ASN1_ITEM_rptr(PKCS7));
+	    ctype_nid, NID_undef, mdalgs, &PKCS7_it);
 }
 
 PKCS7 *
 SMIME_read_PKCS7(BIO *bio, BIO **bcont)
 {
-	return (PKCS7 *)SMIME_read_ASN1(bio, bcont, ASN1_ITEM_rptr(PKCS7));
+	return (PKCS7 *)SMIME_read_ASN1(bio, bcont, &PKCS7_it);
 }
-- 
cgit v1.2.3-55-g6feb