From 80705bfc50cc37ba3f6aa647117eb14c400b23da Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 13 Mar 2011 18:20:14 +0000 Subject: [PATCH] PR: 2469 Submitted by: Jim Studt Reviewed by: steve Check mac is present before trying to retrieve mac iteration count. --- apps/pkcs12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"); -- 2.25.1