Security framework.

[openssl.git] / apps / pkcs12.c

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index decb23e1857a1e2d8760b61019635fdc955e55af..b54c6f84a4a095d4fcc93c90a3adb19abf9f1a5e 100644 (file)
--- 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");
@@ -813,16 +813,6 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
        default:
                BIO_printf (bio_err, "Warning unsupported bag type: ");
                i2a_ASN1_OBJECT (bio_err, bag->type);
-{
-unsigned char *foo = NULL;
-int foolen;
-FILE *op;
-foolen = i2d_PKCS12_SAFEBAG(bag, &foo);
-op = fopen("/tmp/unknown.der", "w");
-fwrite(foo, 1, foolen, op);
-fclose(op);
-}
-
                BIO_printf (bio_err, "\n");
                return 1;
        break;