summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/p12_npas.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_npas.c')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_npas.c4
1 files changed, 2 insertions, 2 deletions
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 @@
1/* $OpenBSD: p12_npas.c,v 1.10 2015/02/14 14:18:58 miod Exp $ */ 1/* $OpenBSD: p12_npas.c,v 1.11 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 */
@@ -211,7 +211,7 @@ newpass_bag(PKCS12_SAFEBAG *bag, char *oldpass, char *newpass)
211 X509_SIG *p8new; 211 X509_SIG *p8new;
212 int p8_nid, p8_saltlen, p8_iter; 212 int p8_nid, p8_saltlen, p8_iter;
213 213
214 if (M_PKCS12_bag_type(bag) != NID_pkcs8ShroudedKeyBag) 214 if (OBJ_obj2nid(bag->type) != NID_pkcs8ShroudedKeyBag)
215 return 1; 215 return 1;
216 216
217 if (!(p8 = PKCS8_decrypt(bag->value.shkeybag, oldpass, -1))) 217 if (!(p8 = PKCS8_decrypt(bag->value.shkeybag, oldpass, -1)))