Skip to content

Commit 524341e

Browse files
panvaaduh95
panva
authored and
aduh95
committed
tools: restore FIPS testing with default OpenSSL
OpenSSL 4.1 falls back to SHA-256 for the md5 command when MD5 is unavailable. Select MD5 explicitly through dgst to avoid a false failure in the negative install check. Use the default shared OpenSSL version for FIPS again instead of pinning it to 3.5. Signed-off-by: Filip Skokan <panva.ip@gmail.com> PR-URL: #67248 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 26a8d53 commit 524341e

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

‎tools/nix/openssl-fips.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
openssl ? (import ./openssl-matrix.nix { }).openssl_3_5,
2+
openssl ? (import ./openssl-matrix.nix { }).openssl,
33
}:
44

55
openssl.overrideAttrs (oldAttrs: {
@@ -48,7 +48,7 @@ openssl.overrideAttrs (oldAttrs: {
4848
4949
openssl mac \
5050
-digest SHA256 -macopt key:key HMAC </dev/null >/dev/null
51-
openssl md5 </dev/null >/dev/null 2>&1 \
51+
openssl dgst -md5 </dev/null >/dev/null 2>&1 \
5252
&& echo "MD5 unexpectedly available with FIPS properties enabled" >&2 \
5353
&& exit 1
5454

0 commit comments

Comments
 (0)