diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-30 08:40:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-30 08:40:25 +0200 |
| commit | 60adbfdea1ee754341d64454274e7aa83bae8971 (patch) | |
| tree | 1b56329c88f1a881b0e7297bb4283cfbb7e39c97 /openssl/apps/pkcs12.c | |
| parent | af72dcd109d7610b96863035541250997c7a172e (diff) | |
| download | vcxsrv-60adbfdea1ee754341d64454274e7aa83bae8971.tar.gz vcxsrv-60adbfdea1ee754341d64454274e7aa83bae8971.tar.bz2 vcxsrv-60adbfdea1ee754341d64454274e7aa83bae8971.zip | |
Upgraded to openssl-1.0.0e
Diffstat (limited to 'openssl/apps/pkcs12.c')
| -rw-r--r-- | openssl/apps/pkcs12.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/apps/pkcs12.c b/openssl/apps/pkcs12.c index 514a02e0f..b54c6f84a 100644 --- a/openssl/apps/pkcs12.c +++ b/openssl/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"); |