From: Tomas Mraz <tomas@openssl.org>
Date: Fri, 5 Mar 2021 17:19:12 +0000 (+0100)
Subject: apps/pkcs12: Allow continuing on absent mac
X-Git-Tag: openssl-3.0.0-alpha13~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=889ad4ef8181093d5c088d5518c7b353ddb48455;p=thirdparty%2Fopenssl.git

apps/pkcs12: Allow continuing on absent mac

Just print a warning in that case.

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14445)
---

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index c729ab5d67a..bd87fd4920f 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -756,6 +756,14 @@ int pkcs12_main(int argc, char **argv)
              */
             unsigned char *utmp;
             int utmplen;
+            unsigned long err = ERR_peek_error();
+
+            if (ERR_GET_LIB(err) == ERR_LIB_PKCS12
+                && ERR_GET_REASON(err) == PKCS12_R_MAC_ABSENT) {
+                BIO_printf(bio_err, "Warning: MAC is absent!\n");
+                goto dump;
+            }
+
             utmp = OPENSSL_asc2uni(mpass, -1, NULL, &utmplen);
             if (utmp == NULL)
                 goto end;
@@ -773,6 +781,7 @@ int pkcs12_main(int argc, char **argv)
         }
     }
 
+ dump:
     assert(private);
     if (!dump_certs_keys_p12(out, p12, cpass, -1, options, passout, enc)) {
         BIO_printf(bio_err, "Error outputting keys and certificates\n");