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/ocsp/ocsp_cl.c   |  4 ++--
 src/lib/libcrypto/ocsp/ocsp_srv.c  |  4 ++--
 src/lib/libcrypto/pkcs12/p12_add.c | 14 +++++++-------
 src/lib/libcrypto/pkcs12/p12_p8d.c |  4 ++--
 src/lib/libcrypto/pkcs12/p12_p8e.c |  4 ++--
 src/lib/libcrypto/pkcs12/p12_utl.c | 18 +++++++++---------
 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 +++++-----
 10 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/lib/libcrypto/ocsp/ocsp_cl.c b/src/lib/libcrypto/ocsp/ocsp_cl.c
index 40417973f5..6b8fb87880 100644
--- a/src/lib/libcrypto/ocsp/ocsp_cl.c
+++ b/src/lib/libcrypto/ocsp/ocsp_cl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ocsp_cl.c,v 1.12 2016/11/04 18:07:23 beck Exp $ */
+/* $OpenBSD: ocsp_cl.c,v 1.13 2016/12/30 15:31:58 jsing Exp $ */
 /* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL
  * project. */
 
@@ -212,7 +212,7 @@ OCSP_response_get1_basic(OCSP_RESPONSE *resp)
 		return NULL;
 	}
 
-	return ASN1_item_unpack(rb->response, ASN1_ITEM_rptr(OCSP_BASICRESP));
+	return ASN1_item_unpack(rb->response, &OCSP_BASICRESP_it);
 }
 
 /* Return number of OCSP_SINGLERESP reponses present in
diff --git a/src/lib/libcrypto/ocsp/ocsp_srv.c b/src/lib/libcrypto/ocsp/ocsp_srv.c
index 1f8aa3141e..ee4a5dd6db 100644
--- a/src/lib/libcrypto/ocsp/ocsp_srv.c
+++ b/src/lib/libcrypto/ocsp/ocsp_srv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ocsp_srv.c,v 1.8 2016/06/25 16:10:26 beck Exp $ */
+/* $OpenBSD: ocsp_srv.c,v 1.9 2016/12/30 15:31:58 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -127,7 +127,7 @@ OCSP_response_create(int status, OCSP_BASICRESP *bs)
 	if (!(rsp->responseBytes = OCSP_RESPBYTES_new()))
 		goto err;
 	rsp->responseBytes->responseType = OBJ_nid2obj(NID_id_pkix_OCSP_basic);
-	if (!ASN1_item_pack(bs, ASN1_ITEM_rptr(OCSP_BASICRESP),
+	if (!ASN1_item_pack(bs, &OCSP_BASICRESP_it,
 	    &rsp->responseBytes->response))
 		goto err;
 	return rsp;
diff --git a/src/lib/libcrypto/pkcs12/p12_add.c b/src/lib/libcrypto/pkcs12/p12_add.c
index cb7f72b365..954ca03ebb 100644
--- a/src/lib/libcrypto/pkcs12/p12_add.c
+++ b/src/lib/libcrypto/pkcs12/p12_add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_add.c,v 1.13 2015/09/30 18:41:06 jsing Exp $ */
+/* $OpenBSD: p12_add.c,v 1.14 2016/12/30 15:34:35 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -156,7 +156,7 @@ PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk)
 		goto err;
 	}
 
-	if (!ASN1_item_pack(sk, ASN1_ITEM_rptr(PKCS12_SAFEBAGS), &p7->d.data)) {
+	if (!ASN1_item_pack(sk, &PKCS12_SAFEBAGS_it, &p7->d.data)) {
 		PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA,
 		    PKCS12_R_CANT_PACK_STRUCTURE);
 		goto err;
@@ -177,7 +177,7 @@ PKCS12_unpack_p7data(PKCS7 *p7)
 		    PKCS12_R_CONTENT_TYPE_NOT_DATA);
 		return NULL;
 	}
-	return ASN1_item_unpack(p7->d.data, ASN1_ITEM_rptr(PKCS12_SAFEBAGS));
+	return ASN1_item_unpack(p7->d.data, &PKCS12_SAFEBAGS_it);
 }
 
 /* Turn a stack of SAFEBAGS into a PKCS#7 encrypted data ContentInfo */
@@ -215,7 +215,7 @@ PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
 	p7->d.encrypted->enc_data->algorithm = pbe;
 	ASN1_OCTET_STRING_free(p7->d.encrypted->enc_data->enc_data);
 	if (!(p7->d.encrypted->enc_data->enc_data = PKCS12_item_i2d_encrypt(
-	    pbe, ASN1_ITEM_rptr(PKCS12_SAFEBAGS), pass, passlen, bags, 1))) {
+	    pbe, &PKCS12_SAFEBAGS_it, pass, passlen, bags, 1))) {
 		PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA,
 		    PKCS12_R_ENCRYPT_ERROR);
 		goto err;
@@ -234,7 +234,7 @@ PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass, int passlen)
 	if (!PKCS7_type_is_encrypted(p7))
 		return NULL;
 	return PKCS12_item_decrypt_d2i(p7->d.encrypted->enc_data->algorithm,
-	    ASN1_ITEM_rptr(PKCS12_SAFEBAGS), pass, passlen,
+	    &PKCS12_SAFEBAGS_it, pass, passlen,
 	    p7->d.encrypted->enc_data->enc_data, 1);
 }
 
@@ -247,7 +247,7 @@ PKCS12_decrypt_skey(PKCS12_SAFEBAG *bag, const char *pass, int passlen)
 int
 PKCS12_pack_authsafes(PKCS12 *p12, STACK_OF(PKCS7) *safes)
 {
-	if (ASN1_item_pack(safes, ASN1_ITEM_rptr(PKCS12_AUTHSAFES),
+	if (ASN1_item_pack(safes, &PKCS12_AUTHSAFES_it,
 	    &p12->authsafes->d.data))
 		return 1;
 	return 0;
@@ -262,5 +262,5 @@ PKCS12_unpack_authsafes(PKCS12 *p12)
 		return NULL;
 	}
 	return ASN1_item_unpack(p12->authsafes->d.data,
-	    ASN1_ITEM_rptr(PKCS12_AUTHSAFES));
+	    &PKCS12_AUTHSAFES_it);
 }
diff --git a/src/lib/libcrypto/pkcs12/p12_p8d.c b/src/lib/libcrypto/pkcs12/p12_p8d.c
index 5d3339e2f2..68af6bf5b5 100644
--- a/src/lib/libcrypto/pkcs12/p12_p8d.c
+++ b/src/lib/libcrypto/pkcs12/p12_p8d.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_p8d.c,v 1.5 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: p12_p8d.c,v 1.6 2016/12/30 15:34:35 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -64,5 +64,5 @@ PKCS8_PRIV_KEY_INFO *
 PKCS8_decrypt(X509_SIG *p8, const char *pass, int passlen)
 {
 	return PKCS12_item_decrypt_d2i(p8->algor,
-	    ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass, passlen, p8->digest, 1);
+	    &PKCS8_PRIV_KEY_INFO_it, pass, passlen, p8->digest, 1);
 }
diff --git a/src/lib/libcrypto/pkcs12/p12_p8e.c b/src/lib/libcrypto/pkcs12/p12_p8e.c
index db3db87214..e39d5975d5 100644
--- a/src/lib/libcrypto/pkcs12/p12_p8e.c
+++ b/src/lib/libcrypto/pkcs12/p12_p8e.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_p8e.c,v 1.6 2015/09/30 18:41:06 jsing Exp $ */
+/* $OpenBSD: p12_p8e.c,v 1.7 2016/12/30 15:34:35 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -86,7 +86,7 @@ PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, const char *pass,
 	p8->algor = pbe;
 	ASN1_OCTET_STRING_free(p8->digest);
 	p8->digest = PKCS12_item_i2d_encrypt(pbe,
-	    ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass, passlen, p8inf, 1);
+	    &PKCS8_PRIV_KEY_INFO_it, pass, passlen, p8inf, 1);
 	if (!p8->digest) {
 		PKCS12err(PKCS12_F_PKCS8_ENCRYPT, PKCS12_R_ENCRYPT_ERROR);
 		goto err;
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);
 }
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