diff options
author | tb <> | 2025-05-10 19:01:16 +0000 |
---|---|---|
committer | tb <> | 2025-05-10 19:01:16 +0000 |
commit | d0f630df58abad993d660fe05904329afd962089 (patch) | |
tree | 8f28a79ed8e3c3edb243f185a3159fdda9a7a4b7 /src/lib/libcrypto/pkcs12 | |
parent | c4f52d97f899ca9b2eb3e928a0efd05484fbd673 (diff) | |
download | openbsd-master.tar.gz openbsd-master.tar.bz2 openbsd-master.zip |
Currently PKCS12_setup_mac() function uses salt length of 8 bytes / 64
bits when no salt length is specified. Increase this fallback default
to 16 bytes / 128 bits, as recommended by NIST SP 800-132.
Note this is for interoperability purposes. Some FIPS implementations
enforce minimum salt length of 16 bytes. Examples of such FIPS
implemenations are Bouncycastle FIPS Java API and Chainguard FIPS
Provider for OpenSSL. Also future v3.6 release of OpenSSL will also
increase the default salt length to 16 bytes.
From Dimitri John Ledkov, thanks
Diffstat (limited to 'src/lib/libcrypto/pkcs12')
-rw-r--r-- | src/lib/libcrypto/pkcs12/pkcs12.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/pkcs12/pkcs12.h b/src/lib/libcrypto/pkcs12/pkcs12.h index 200712039b..aec0362806 100644 --- a/src/lib/libcrypto/pkcs12/pkcs12.h +++ b/src/lib/libcrypto/pkcs12/pkcs12.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pkcs12.h,v 1.29 2025/03/09 15:45:52 tb Exp $ */ | 1 | /* $OpenBSD: pkcs12.h,v 1.30 2025/05/10 19:01:16 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -77,7 +77,7 @@ extern "C" { | |||
77 | 77 | ||
78 | #define PKCS12_MAC_KEY_LENGTH 20 | 78 | #define PKCS12_MAC_KEY_LENGTH 20 |
79 | 79 | ||
80 | #define PKCS12_SALT_LEN 8 | 80 | #define PKCS12_SALT_LEN 16 |
81 | 81 | ||
82 | /* Uncomment out next line for unicode password and names, otherwise ASCII */ | 82 | /* Uncomment out next line for unicode password and names, otherwise ASCII */ |
83 | 83 | ||