File 0406-ssl-Extend-fips-recognition.patch of Package erlang
From 48cb8e739ae35869beb73b2780a04d612f5f2847 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Wed, 22 Jun 2022 16:39:59 +0200
Subject: [PATCH] ssl: Extend fips recognition
---
lib/ssl/test/openssl_server_cert_SUITE.erl | 12 +++++++++++-
lib/ssl/test/ssl_test_lib.erl | 9 +++++++--
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/lib/ssl/test/openssl_server_cert_SUITE.erl b/lib/ssl/test/openssl_server_cert_SUITE.erl
index cbcb57ded1..55b7acbc2b 100644
--- a/lib/ssl/test/openssl_server_cert_SUITE.erl
+++ b/lib/ssl/test/openssl_server_cert_SUITE.erl
@@ -350,7 +350,17 @@ init_per_group(dsa = Group, Config0) ->
{skip, "Missing DSS crypto support"}
end;
init_per_group(GroupName, Config) ->
- ssl_test_lib:init_per_group_openssl(GroupName, Config).
+ case ssl_test_lib:is_protocol_version(GroupName) of
+ true ->
+ case ssl_test_lib:check_sane_openssl_version(GroupName) of
+ true ->
+ ssl_test_lib:init_per_group_openssl(GroupName, Config);
+ false ->
+ {skip, {atom_to_list(GroupName) ++ " not supported by OpenSSL"}}
+ end;
+ false ->
+ Config
+ end.
end_per_group(GroupName, Config) ->
ssl_test_lib:end_per_group(GroupName, Config).
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 638cf095df..0ee97ff531 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -3146,8 +3146,13 @@ is_fips(openssl) ->
VersionStr = portable_cmd("openssl",["version"]),
case re:split(VersionStr, "fips") of
[_] ->
- false;
- _ ->
+ case re:split(VersionStr, "FIPS") of
+ [_] ->
+ false;
+ _ ->
+ true
+ end;
+ _ ->
true
end;
is_fips(crypto) ->
--
2.35.3