projects / openssl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b84965a)
apps/pkcs12: Really do not perform MAC in case -nomac
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>
Mon, 11 May 2020 13:49:34 +0000 (15:49 +0200)
committerDr. David von Oheimb <David.von.Oheimb@siemens.com>
Thu, 19 Nov 2020 10:36:02 +0000 (11:36 +0100)
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/4930)

apps/pkcs12.c patch | blob | history

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 67da0823906c6bd018f6c64b5489cc27e7d448f9..12f066c0de50735932a09b6508e56425444636e7 100644 (file)
--- 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:
Unnamed repository; edit this file 'description' to name the repository.