From: Marco Abbadini <39488007+marcoabbadini@users.noreply.github.com>
Date: Tue, 16 May 2023 21:52:53 +0000 (+0200)
Subject: pkcs12: Fix macsaltlen parameter type
X-Git-Tag: openssl-3.2.0-alpha1~803
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26cf0767a71743de00cd20f90526052358d67d03;p=thirdparty%2Fopenssl.git

pkcs12: Fix macsaltlen parameter type

It expects an integer so change it from non-argument type to positive integer type.

Fixes #20969

CLA: trivial

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

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 0c39ed79bd4..4f2d3f7f2ef 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -152,7 +152,7 @@ const OPTIONS pkcs12_options[] = {
     {"noiter", OPT_NOITER, '-', "Don't use encryption iteration"},
     {"nomaciter", OPT_NOMACITER, '-', "Don't use MAC iteration)"},
     {"maciter", OPT_MACITER, '-', "Unused, kept for backwards compatibility"},
-    {"macsaltlen", OPT_MACSALTLEN, '-', "Specify the salt len for MAC"},
+    {"macsaltlen", OPT_MACSALTLEN, 'p', "Specify the salt len for MAC"},
     {"nomac", OPT_NOMAC, '-', "Don't generate MAC"},
     {NULL}
 };