From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 13 Mar 2011 18:23:24 +0000 (+0000)
Subject: PR: 2469
X-Git-Tag: OpenSSL_0_9_8s~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32cd1da62e1238ed2d23f5244870766e4cbdd0f7;p=openssl

PR: 2469
Submitted by: Jim Studt <jim@studt.net>
Reviewed by: steve

Check mac is present before trying to retrieve mac iteration count.
---

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");