diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2011-03-13 18:23:24 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2011-03-13 18:23:24 +0000 |
commit | 32cd1da62e1238ed2d23f5244870766e4cbdd0f7 (patch) | |
tree | 3c9639b4004d0088e1957389ea48b4ca66732a99 /apps/pkcs12.c | |
parent | d430f56de6e585ee1ef0eee42cd7738ef27a2862 (diff) |
PR: 2469
Submitted by: Jim Studt <jim@studt.net>
Reviewed by: steve
Check mac is present before trying to retrieve mac iteration count.
Diffstat (limited to 'apps/pkcs12.c')
-rw-r--r-- | apps/pkcs12.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 0db0b79765..4860560b92 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -659,7 +659,7 @@ int MAIN(int argc, char **argv) if (!twopass) BUF_strlcpy(macpass, pass, sizeof macpass); - if (options & INFO) BIO_printf (bio_err, "MAC Iteration %ld\n", p12->mac->iter ? ASN1_INTEGER_get (p12->mac->iter) : 1); + if ((options & INFO) && p12->mac) BIO_printf (bio_err, "MAC Iteration %ld\n", p12->mac->iter ? ASN1_INTEGER_get (p12->mac->iter) : 1); if(macver) { #ifdef CRYPTO_MDEBUG CRYPTO_push_info("verify MAC"); |