Get rid of some unnecessary casts and add a necessary one.

[oweals/openssl.git] / apps / pkcs12.c

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 0fe519ff178863bc8eccbcb8ba409ae42bc04c1f..6a70d9b47c673a1318bf8e77a6b10e0ba350af48 100644 (file)
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -371,8 +371,6 @@ if (export_cert) {
 
        if (canames) sk_free(canames);
 
-       /* if (!pmatch) ...?  What should happen here?  XXX */
-
        if(!noprompt &&
                EVP_read_pw_string(pass, 50, "Enter Export Password:", 1)) {
            BIO_printf (bio_err, "Can't read Password\n");
@@ -400,7 +398,7 @@ if (export_cert) {
                        cpass, -1, NULL, 0, iter, p8);
        PKCS8_PRIV_KEY_INFO_free(p8);
         if (name) PKCS12_add_friendlyname (bag, name, -1);
-       PKCS12_add_localkeyid (bag, keyid, keyidlen);
+       if(pmatch) PKCS12_add_localkeyid (bag, keyid, keyidlen);
        bags = sk_new(NULL);
        sk_push (bags, (char *)bag);
        /* Turn it into unencrypted safe bag */