From: Dr. David von Oheimb <David.von.Oheimb@siemens.com>
Date: Mon, 11 May 2020 13:49:34 +0000 (+0200)
Subject: apps/pkcs12: Really do not perform MAC in case -nomac
X-Git-Tag: openssl-3.0.0-alpha9~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=852feb3bd8a42ab441bd726ffc96c5757b7a936c;p=thirdparty%2Fopenssl.git

apps/pkcs12: Really do not perform MAC in case -nomac

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/4930)
---

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 67da0823906..12f066c0de5 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -235,6 +235,7 @@ int pkcs12_main(int argc, char **argv)
             maciter = 1;
             break;
         case OPT_NOMAC:
+            cert_pbe = -1;
             maciter = -1;
             break;
         case OPT_MACALG: