summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/p12_kiss.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_kiss.c')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_kiss.c6
1 files changed, 3 insertions, 3 deletions
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 @@
1/* $OpenBSD: p12_kiss.c,v 1.17 2016/03/11 07:08:44 mmcc Exp $ */ 1/* $OpenBSD: p12_kiss.c,v 1.18 2016/12/30 15:08:22 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -235,7 +235,7 @@ parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, EVP_PKEY **pkey,
235 if ((attrib = PKCS12_get_attr (bag, NID_localKeyID))) 235 if ((attrib = PKCS12_get_attr (bag, NID_localKeyID)))
236 lkid = attrib->value.octet_string; 236 lkid = attrib->value.octet_string;
237 237
238 switch (M_PKCS12_bag_type(bag)) { 238 switch (OBJ_obj2nid(bag->type)) {
239 case NID_keyBag: 239 case NID_keyBag:
240 if (!pkey || *pkey) 240 if (!pkey || *pkey)
241 return 1; 241 return 1;
@@ -255,7 +255,7 @@ parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, EVP_PKEY **pkey,
255 break; 255 break;
256 256
257 case NID_certBag: 257 case NID_certBag:
258 if (M_PKCS12_cert_bag_type(bag) != NID_x509Certificate ) 258 if (OBJ_obj2nid(bag->value.bag->type) != NID_x509Certificate )
259 return 1; 259 return 1;
260 if (!(x509 = PKCS12_certbag2x509(bag))) 260 if (!(x509 = PKCS12_certbag2x509(bag)))
261 return 0; 261 return 0;