From bc47d02ea103d63b51c59361973287705bbd9b62 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Fri, 30 Dec 2016 15:08:22 +0000
Subject: Expand M_PKCS12_* "compatibility" macros. No change to generated
 assembly.

---
 src/lib/libcrypto/pkcs12/p12_kiss.c |  6 +++---
 src/lib/libcrypto/pkcs12/p12_npas.c |  4 ++--
 src/lib/libcrypto/pkcs12/p12_utl.c  | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/pkcs12/p12_kiss.c b/src/lib/libcrypto/pkcs12/p12_kiss.c
index df992a68fc..eb2c3a76d5 100644
--- a/src/lib/libcrypto/pkcs12/p12_kiss.c
+++ b/src/lib/libcrypto/pkcs12/p12_kiss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_kiss.c,v 1.17 2016/03/11 07:08:44 mmcc Exp $ */
+/* $OpenBSD: p12_kiss.c,v 1.18 2016/12/30 15:08:22 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -235,7 +235,7 @@ parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, EVP_PKEY **pkey,
 	if ((attrib = PKCS12_get_attr (bag, NID_localKeyID)))
 		lkid = attrib->value.octet_string;
 
-	switch (M_PKCS12_bag_type(bag)) {
+	switch (OBJ_obj2nid(bag->type)) {
 	case NID_keyBag:
 		if (!pkey || *pkey)
 			return 1;
@@ -255,7 +255,7 @@ parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, EVP_PKEY **pkey,
 		break;
 
 	case NID_certBag:
-		if (M_PKCS12_cert_bag_type(bag) != NID_x509Certificate )
+		if (OBJ_obj2nid(bag->value.bag->type) != NID_x509Certificate )
 			return 1;
 		if (!(x509 = PKCS12_certbag2x509(bag)))
 			return 0;
diff --git a/src/lib/libcrypto/pkcs12/p12_npas.c b/src/lib/libcrypto/pkcs12/p12_npas.c
index b9dea51b85..7803721a26 100644
--- a/src/lib/libcrypto/pkcs12/p12_npas.c
+++ b/src/lib/libcrypto/pkcs12/p12_npas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_npas.c,v 1.10 2015/02/14 14:18:58 miod Exp $ */
+/* $OpenBSD: p12_npas.c,v 1.11 2016/12/30 15:08:22 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -211,7 +211,7 @@ newpass_bag(PKCS12_SAFEBAG *bag, char *oldpass, char *newpass)
 	X509_SIG *p8new;
 	int p8_nid, p8_saltlen, p8_iter;
 
-	if (M_PKCS12_bag_type(bag) != NID_pkcs8ShroudedKeyBag)
+	if (OBJ_obj2nid(bag->type) != NID_pkcs8ShroudedKeyBag)
 		return 1;
 
 	if (!(p8 = PKCS8_decrypt(bag->value.shkeybag, oldpass, -1)))
diff --git a/src/lib/libcrypto/pkcs12/p12_utl.c b/src/lib/libcrypto/pkcs12/p12_utl.c
index d7b9f9d2e6..e02ff3073e 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.13 2016/11/05 14:24:29 miod Exp $ */
+/* $OpenBSD: p12_utl.c,v 1.14 2016/12/30 15:08:22 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -165,9 +165,9 @@ PKCS12_x509crl2certbag(X509_CRL *crl)
 X509 *
 PKCS12_certbag2x509(PKCS12_SAFEBAG *bag)
 {
-	if (M_PKCS12_bag_type(bag) != NID_certBag)
+	if (OBJ_obj2nid(bag->type) != NID_certBag)
 		return NULL;
-	if (M_PKCS12_cert_bag_type(bag) != NID_x509Certificate)
+	if (OBJ_obj2nid(bag->value.bag->type) != NID_x509Certificate)
 		return NULL;
 	return ASN1_item_unpack(bag->value.bag->value.octet,
 	    ASN1_ITEM_rptr(X509));
@@ -176,9 +176,9 @@ PKCS12_certbag2x509(PKCS12_SAFEBAG *bag)
 X509_CRL *
 PKCS12_certbag2x509crl(PKCS12_SAFEBAG *bag)
 {
-	if (M_PKCS12_bag_type(bag) != NID_crlBag)
+	if (OBJ_obj2nid(bag->type) != NID_crlBag)
 		return NULL;
-	if (M_PKCS12_cert_bag_type(bag) != NID_x509Crl)
+	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));
-- 
cgit v1.2.3-55-g6feb