From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 13 Mar 2011 18:20:14 +0000 (+0000)
Subject: PR: 2469
X-Git-Tag: OpenSSL_1_0_0e~61
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=80705bfc50cc37ba3f6aa647117eb14c400b23da;p=oweals%2Fopenssl.git

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