Commit aa24c4a7 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 2469 

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

Check mac is present before trying to retrieve mac iteration count.
parent d70fcb96

apps/pkcs12.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -647,7 +647,7 @@ int MAIN(int argc, char **argv) 




    if (!twopass) BUF_strlcpy(macpass, pass, sizeof macpass);

    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) {

    if(macver) {

#ifdef CRYPTO_MDEBUG

#ifdef CRYPTO_MDEBUG

    CRYPTO_push_info("verify MAC");

    CRYPTO_push_info("verify MAC");