File 0735-ssh-Fix-algorithm-test-suite-for-crypto-fips-mode-ch.patch of Package erlang
From 7432f5e951d527aaa11680b16ef3ba7eaa184c4f Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Mon, 15 Nov 2021 09:16:18 +0100
Subject: [PATCH 2/2] ssh: Fix algorithm test suite for crypto fips mode
changing
The ssh_algorithms_SUITE enabled fips mode to late, that is, after
having configured the groups/1.
---
lib/ssh/test/ssh_algorithms_SUITE.erl | 120 ++++++++++++++++++--------
1 file changed, 82 insertions(+), 38 deletions(-)
diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index 1b8c09c088..7a7a236a6c 100644
--- a/lib/ssh/test/ssh_algorithms_SUITE.erl
+++ b/lib/ssh/test/ssh_algorithms_SUITE.erl
@@ -86,6 +86,24 @@ groups() ->
|| {Tag,Algs} <- ErlAlgos ++ DoubleAlgos,
Alg <- Algs],
+ ct:log(
+ "ErlAlgos = ~p~n"
+ "SshcAlgos = ~p~n"
+ "SshdAlgos = ~p~n"
+ "DoubleAlgos = ~p~n"
+ "TypeSSH = ~p~n"
+ "TagGroupSet = ~p~n"
+ "AlgoTcSet = ~p~n"
+ ,[
+ ErlAlgos,
+ SshcAlgos,
+ SshdAlgos,
+ DoubleAlgos,
+ TypeSSH,
+ TagGroupSet,
+ AlgoTcSet
+ ]),
+
TagGroupSet ++ AlgoTcSet.
tags() -> [kex,cipher,mac,compression,public_key].
@@ -146,50 +164,76 @@ init_per_group(Group, Config) ->
Tag = proplists:get_value(name,
hd(proplists:get_value(tc_group_path, Config))),
Alg = Group,
- init_per_group(Tag, Alg, Config)
+ Algs = split(Tag, Alg),
+ SupportedAlgs = proplists:get_value(Tag, ssh_transport:supported_algorithms()),
+ PA =
+ case Algs of
+ [_] ->
+ [Alg];
+ [A1,A2] when Tag == public_key ->
+ [A1,A2];
+ [A1,A2] ->
+ [{client2server,[A1]},
+ {server2client,[A2]}]
+ end,
+ case lists:foldl(fun({K,As}, Acc) ->
+ ct:log("~p:~p K=~p, As=~p, SupportedAlgs=~p", [?MODULE,?LINE,K,As,SupportedAlgs]),
+ SAs = proplists:get_value(K,SupportedAlgs),
+ lists:foldl(fun(A1, Acc1) ->
+ case lists:member(A1, SAs) of
+ true -> Acc1;
+ false -> [A1|Acc1]
+ end
+ end, Acc, As);
+ (A, Acc) when is_atom(hd(SupportedAlgs)) ->
+ ct:log("~p:~p A=~p, SupportedAlgs=~p", [?MODULE,?LINE,A,SupportedAlgs]),
+ case lists:member(A, SupportedAlgs) of
+ true -> Acc;
+ false -> [A|Acc]
+ end;
+ (A, Acc) when is_tuple(hd(SupportedAlgs)) ->
+ ct:log("~p:~p A=~p, SupportedAlgs=~p", [?MODULE,?LINE,A,SupportedAlgs]),
+ [{_,S1},{_,S2}] = SupportedAlgs,
+
+ case lists:member(A, S1) andalso
+ lists:member(A, S2) of
+ true -> Acc;
+ false -> [A|Acc]
+ end
+ end, [], PA) of
+ [] ->
+ init_per_group(Tag, Algs, Alg, PA, Config);
+ L ->
+ ct:log("~p:~p Tag ~p, Alg ~p, Algs ~p, PA ~p,~nSupportedAlgs ~p", [?MODULE,?LINE, Tag, Alg, Algs, PA, SupportedAlgs]),
+ {skip,io_lib:format("Unsupported ~p: ~p", [Tag,L])}
+ end
end.
-init_per_group(public_key=Tag, Alg, Config) ->
- PA =
- case split(Tag, Alg) of
- [_] ->
- [Alg];
- [A1,A2] ->
- [A1,A2]
- end,
+init_per_group(Tag, Algs, Alg, PA, Config) ->
OtherAlgs = [{T,L} || {T,L} <- ssh_transport:supported_algorithms(), T=/=Tag],
- ct:log("Init tests for public_key ~p~nOtherAlgs=~p",[PA,OtherAlgs]),
+ ct:log("init_per_group Tag ~p, Alg ~p, Algs ~p ,PA ~p,~nOtherAlgs ~p", [Tag, Alg, Algs, PA, OtherAlgs]),
PrefAlgs = {preferred_algorithms,[{Tag,PA}|OtherAlgs]},
- %% Daemon started later in init_per_testcase
- try
- setup_pubkey(PA,
- [{pref_algs,PrefAlgs},
- {tag_alg,{Tag,PA}}
- | Config])
- catch
- _C:_E:_S ->
- ct:log("Exception ~p:~p~n~p",[_C,_E,_S]),
- {skip, io_lib:format("Unsupported: ~p",[Alg])}
- end;
-
-init_per_group(Tag, Alg, Config) ->
- PA =
- case split(Tag, Alg) of
- [_] ->
- [Alg];
- [A1,A2] ->
- [{client2server,[A1]},
- {server2client,[A2]}]
- end,
- OtherAlgs = [{T,L} || {T,L} <- ssh_transport:supported_algorithms(), T=/=Tag],
- ct:log("Init tests for tag=~p alg=~p~nOtherAlgs=~p",[Tag,PA,OtherAlgs]),
- PrefAlgs = {preferred_algorithms,[{Tag,PA}|OtherAlgs]},
- start_std_daemon([PrefAlgs],
- [{pref_algs,PrefAlgs},
- {tag_alg,{Tag,[Alg]}}
- | Config]).
+ case Tag of
+ public_key ->
+ %% Daemon started later in init_per_testcase
+ try
+ setup_pubkey(PA,
+ [{pref_algs,PrefAlgs},
+ {tag_alg,{Tag,PA}}
+ | Config])
+ catch
+ _C:_E:_S ->
+ ct:log("Exception ~p:~p~n~p",[_C,_E,_S]),
+ {skip, io_lib:format("Unsupported: ~p",[Alg])}
+ end;
+ _ ->
+ start_std_daemon([PrefAlgs],
+ [{pref_algs,PrefAlgs},
+ {tag_alg,{Tag,[Alg]}}
+ | Config])
+ end.
end_per_group(_Alg, Config) ->
case proplists:get_value(srvr_pid,Config) of
--
2.31.1
