summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>2020-05-11 15:49:34 +0200
committerDr. David von Oheimb <David.von.Oheimb@siemens.com>2020-11-19 11:36:02 +0100
commit852feb3bd8a42ab441bd726ffc96c5757b7a936c (patch)
tree65ca1f1c591babe5577326643ce38488e3952fa7 /apps
parentb84965aff0451dd914d54d3fbb6b9d347e1cd947 (diff)
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)
Diffstat (limited to 'apps')
-rw-r--r--apps/pkcs12.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 67da082390..12f066c0de 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: