diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-09-26 13:24:24 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-02-08 18:43:48 +0000 |
| commit | 03922a635b363643cfaa28e282a090e593530d2a (patch) | |
| tree | c57b0f20912f63e3175422e72fd2885cd043799c /crypto/pkcs12/p12_npas.c | |
| parent | a40d594984f774e8563f3d932807a07c5548b181 (diff) | |
| download | openssl-03922a635b363643cfaa28e282a090e593530d2a.tar.gz | |
more PKCS12 opacity
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/pkcs12/p12_npas.c')
| -rw-r--r-- | crypto/pkcs12/p12_npas.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/pkcs12/p12_npas.c b/crypto/pkcs12/p12_npas.c index d670624b4e..2bd25e47ef 100644 --- a/crypto/pkcs12/p12_npas.c +++ b/crypto/pkcs12/p12_npas.c @@ -62,6 +62,7 @@ #include <openssl/pem.h> #include <openssl/err.h> #include <openssl/pkcs12.h> +#include "p12_lcl.h" /* PKCS#12 password change routine */ @@ -202,7 +203,7 @@ static int 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 (PKCS12_bag_type(bag) != NID_pkcs8ShroudedKeyBag) return 1; if ((p8 = PKCS8_decrypt(bag->value.shkeybag, oldpass, -1)) == NULL) |