diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-03-13 18:20:01 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-03-13 18:20:01 +0000 |
| commit | aa24c4a736b095bfaa0698bf87e61bec7b5d8691 (patch) | |
| tree | 77017766d9c19dd15c25d554d3954d2ef324d99c /apps | |
| parent | d70fcb96ac3ed2d6182a966010f4bcdc7e898a67 (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')
| -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 514a02e0f1..b54c6f84a4 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -647,7 +647,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"); |