From 1ac942fa8a015058791a7b0e48924e2b3201f528 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Fri, 30 Dec 2016 15:47:07 +0000
Subject: Expand ASN1_ITEM_rptr macros - no change in generated assembly.

---
 src/lib/libcrypto/rsa/rsa_ameth.c | 6 +++---
 src/lib/libcrypto/rsa/rsa_asn1.c  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/rsa/rsa_ameth.c b/src/lib/libcrypto/rsa/rsa_ameth.c
index 8faddcee1c..aa911251cc 100644
--- a/src/lib/libcrypto/rsa/rsa_ameth.c
+++ b/src/lib/libcrypto/rsa/rsa_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_ameth.c,v 1.16 2016/10/19 16:49:11 jsing Exp $ */
+/* $OpenBSD: rsa_ameth.c,v 1.17 2016/12/30 15:47:07 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -588,7 +588,7 @@ rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,
 			/* need to embed algorithm ID inside another */
 			mgf1alg = X509_ALGOR_new();
 			X509_ALGOR_set_md(mgf1alg, mgf1md);
-			if (!ASN1_item_pack(mgf1alg, ASN1_ITEM_rptr(X509_ALGOR),
+			if (!ASN1_item_pack(mgf1alg, &X509_ALGOR_it,
 			    &stmp))
 				goto err;
 			pss->maskGenAlgorithm = X509_ALGOR_new();
@@ -598,7 +598,7 @@ rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,
 			    OBJ_nid2obj(NID_mgf1), V_ASN1_SEQUENCE, stmp);
 		}
 		/* Finally create string with pss parameter encoding. */
-		if (!ASN1_item_pack(pss, ASN1_ITEM_rptr(RSA_PSS_PARAMS), &os1))
+		if (!ASN1_item_pack(pss, &RSA_PSS_PARAMS_it, &os1))
 			goto err;
 		if (alg2) {
 			os2 = ASN1_STRING_dup(os1);
diff --git a/src/lib/libcrypto/rsa/rsa_asn1.c b/src/lib/libcrypto/rsa/rsa_asn1.c
index 27afdece00..f931a93e85 100644
--- a/src/lib/libcrypto/rsa/rsa_asn1.c
+++ b/src/lib/libcrypto/rsa/rsa_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_asn1.c,v 1.12 2015/02/14 15:06:55 jsing Exp $ */
+/* $OpenBSD: rsa_asn1.c,v 1.13 2016/12/30 15:47:07 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -298,11 +298,11 @@ i2d_RSAPublicKey(const RSA *a, unsigned char **out)
 RSA *
 RSAPublicKey_dup(RSA *rsa)
 {
-	return ASN1_item_dup(ASN1_ITEM_rptr(RSAPublicKey), rsa);
+	return ASN1_item_dup(&RSAPublicKey_it, rsa);
 }
 
 RSA *
 RSAPrivateKey_dup(RSA *rsa)
 {
-	return ASN1_item_dup(ASN1_ITEM_rptr(RSAPrivateKey), rsa);
+	return ASN1_item_dup(&RSAPrivateKey_it, rsa);
 }
-- 
cgit v1.2.3-55-g6feb