]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Fix wrong default algorithm in openssl pkcs12 help
authorArne Schwabe <arne@rfc2549.org>
Thu, 28 Jul 2022 14:51:58 +0000 (16:51 +0200)
committerTomas Mraz <tomas@openssl.org>
Mon, 1 Aug 2022 09:54:36 +0000 (11:54 +0200)
The default that pkcs12 -export uses is SHA256 and not SHA1.

CLA: Trivial

Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18904)

apps/pkcs12.c

index 645e30e72f8e368b6b38f8d9456d7a8e6457aba6..0338ff30d6e1d94d4c07f678d1bd2a3048e651ac 100644 (file)
@@ -144,7 +144,7 @@ const OPTIONS pkcs12_options[] = {
      "Encrypt output with 3DES (default PBES2 with PBKDF2 and AES-256 CBC)"},
 #endif
     {"macalg", OPT_MACALG, 's',
-     "Digest algorithm to use in MAC (default SHA1)"},
+     "Digest algorithm to use in MAC (default SHA256)"},
     {"iter", OPT_ITER, 'p', "Specify the iteration count for encryption and MAC"},
     {"noiter", OPT_NOITER, '-', "Don't use encryption iteration"},
     {"nomaciter", OPT_NOMACITER, '-', "Don't use MAC iteration)"},