ssh: benchmark all common kex and cipher algorithms

2 files changed, 111 insertions, 5 deletions

diff --git a/lib/ssh/test/ssh_benchmark_SUITE.erl b/lib/ssh/test/ssh_benchmark_SUITE.erl
index 0a11654116..2add99de97 100644
--- a/lib/ssh/test/ssh_benchmark_SUITE.erl
+++ b/lib/ssh/test/ssh_benchmark_SUITE.erl
@@ -47,6 +47,7 @@ init_per_suite(Config) ->
     catch crypto:stop(),
     try 
 	ok = crypto:start(),
+	report_client_algorithms(),
 	ok = ssh:start(),
 	{ok,TracerPid} = erlang_trace(),
 	[{tracer_pid,TracerPid} | Config]
@@ -95,6 +96,34 @@ end_per_testcase(_Func, _Conf) ->
 
 %%%================================================================
 openssh_client_shell(Config) ->
+    CommonAlgs = ssh_test_lib:intersect_bi_dir(
+		   ssh_test_lib:intersection(ssh:default_algorithms(),
+					     ssh_test_lib:default_algorithms(sshc))),
+    KexVariants = 
+	[ [{kex,[Kex]}]
+	  || Kex <- proplists:get_value(kex, CommonAlgs)],
+    CipherVariants = 
+	[ [{cipher,[{client2server,[Cipher]},
+		    {server2client,[Cipher]}]}]
+	  || Cipher <- proplists:get_value(cipher, CommonAlgs)],
+    
+    
+    lists:foreach(
+      fun(PrefAlgs=[{kex,[Kex]}]) when Kex == 'diffie-hellman-group-exchange-sha256' ->
+	      lists:foreach(
+		fun(Grp) ->
+			openssh_client_shell(Config, 
+					     [{preferred_algorithms, PrefAlgs},
+					      {dh_gex_groups, [Grp]}
+					     ])
+		end, moduli());
+	 (PrefAlgs) -> 
+	      openssh_client_shell(Config, 
+				   [{preferred_algorithms, PrefAlgs}])
+      end, KexVariants ++ CipherVariants).
+    
+
+openssh_client_shell(Config, Options) ->
     SystemDir = ?config(data_dir, Config),
     UserDir = ?config(priv_dir, Config),
     KnownHosts = filename:join(UserDir, "known_hosts"),
@@ -103,7 +132,8 @@ openssh_client_shell(Config) ->
     {ServerPid, _Host, Port} =
 	ssh_test_lib:daemon([{system_dir, SystemDir},
 			     {public_key_alg, ssh_dsa},
-			     {failfun, fun ssh_test_lib:failfun/2}]),
+			     {failfun, fun ssh_test_lib:failfun/2} |
+			     Options]),
     ct:sleep(500),
 
     Data = lists:duplicate(100000, $a),
@@ -134,9 +164,10 @@ openssh_client_shell(Config) ->
 				   {name, mk_name(["Cipher ",A," ",B," [",Unit,"]"])}
 				  ];
 			      kex ->
+				  KexAlgStr = fmt_alg(Algs#alg.kex, List),
 				  [{value, Value},
 				   {suite, ?MODULE}, 
-				   {name, mk_name(["Erl server kex ",Algs#alg.kex," [",Unit,"]"])}
+				   {name, mk_name(["Erl server kex ",KexAlgStr," [",Unit,"]"])}
 				  ];
 			      _ when is_atom(Tag) ->
 				  [{value, Value},
@@ -158,6 +189,20 @@ openssh_client_shell(Config) ->
 
 
 %%%================================================================
+fmt_alg(Alg, List) when is_atom(Alg) ->
+    fmt_alg(atom_to_list(Alg), List);
+fmt_alg(Alg = "diffie-hellman-group-exchange-sha" ++ _, List) ->
+    try 
+	integer_to_list(find_gex_size_string(List))
+    of
+	GexSize -> lists:concat([Alg," ",GexSize])
+    catch
+	_:_ -> Alg
+    end;
+fmt_alg(Alg, List) ->
+    Alg.
+
+%%%----------------------------------------------------------------
 mk_name(Name) -> [char(C) || C <- lists:concat(Name)].
 
 char($-) -> $_;
@@ -239,10 +284,16 @@ find([], _, Acc) ->
 
 
 find_algs(L) ->
-    {value,#call{result={ok,Algs}}} =
+    {value, #call{result={ok,Algs}}} =
 	lists:keysearch({ssh_transport,select_algorithm,3}, #call.mfa, L),
     Algs.
 
+find_gex_size_string(L) ->
+    %% server
+    {value, #call{result={ok,{Size, _}}}} =
+	lists:keysearch({public_key,dh_gex_group,4}, #call.mfa, L),
+    Size.
+
 %%%----------------
 crypto_algs_times_sizes(EncDecs, L) ->
     Raw = [{_Algorithm = case EncDec of
@@ -290,7 +341,8 @@ erlang_trace() ->
 		{ssh_message,decode,1},
 		{ssh_transport,select_algorithm,3},
 		{ssh_transport,encrypt,2},
-		{ssh_transport,decrypt,2}
+		{ssh_transport,decrypt,2},
+		{public_key,dh_gex_group,4} % To find dh_gex group size
 	       ]],
     {ok, TracerPid}.
 
@@ -345,9 +397,30 @@ find_return(_, _, []) ->
     {undefined, undefined}.
 
 %%%----------------------------------------------------------------
+report_client_algorithms() ->
+    try
+	ssh_test_lib:extract_algos( ssh_test_lib:default_algorithms(sshc) )
+    of
+	ClientAlgs ->
+	    ct:pal("The client supports:~n~p",[ClientAlgs])
+    catch
+	Cls:Err ->
+	    ct:pal("Testing client about algorithms failed:~n~p  ~p",[Cls,Err])
+    end.
+
+%%%----------------------------------------------------------------
+
+
 now2sec({A,B,C}) -> A*1000000 + B + C/1000000.
 
 now2micro_sec({A,B,C}) -> (A*1000000 + B)*1000000 + C.
 		    
 now_diff({A1,B1,C1}, {A0,B0,C0}) -> {A1-A0, B1-B0, C1-C0}.
 
+%%%================================================================
+moduli() ->
+    [{1023, 5, 16#CF973CD39DC7D62F2C45AAC5180491104C76E0FE5D80A10E6C06AE442F1F373167B0FCBC931F3C157B10A5557008FDE20D68051E6A4DB11CEE0B0749F76D7134B937A59DA998C42BC234A5C1A3CFCD70E624D253D7694076F7B1FD7B8D3427849C9377B3555796ACA58C69DFF542EEEC9859D3ADCE5CC88DF6F7817C9D182EB7},
+     {2047, 5, 16#F7693FC11FDDEAA493D3BA36F1FFF9264AA9952209203192A88A697BE9D0E306E306A27430BD87AB9EE9DB4BC78C41950C2EB0E5E4C686E8B1BA6D6A2B1FE91EF40C5EA32C51018323E1D305FE637F35ACABDBFC40AD683F779570A76869EB90015A342B2D1F7C81602688081FCAAA8D623090258D9C5C729C8CDDC0C12CA2D561DD987DB79B6AD7A2A509EBC383BF223FD95BC5A2FCC26FB3F3A0DD3FDC1228E338D3290235A596F9465F7BF490974847E616229A9E60B8F4AA161C52F655843CCCAE8821B40C426B535DE087964778652BBD4EC601C0456AE7128B593FCC64402C891227AE6EE88CC839416FBF462B4852999C646BE0BED7D8CF2BE5E381EF},
+     {4095, 2, 16#C8842271626E53546E0C712FA265713F2EE073C20A0723C96B6B182B1EAACC96233D4A199BD0E85F264078A513AD2454F284B8DF543D85019D1E70F2FF54BA43EFBC64AF465C170C3E376F5EC328F98E33E1ED8BED84FA097ABE584152B0E9827ED5CC2B1D4F5ECF2DC46F45C59816D02698EA26F319311E2B6973E83C37021CC8B416AEF653896A1764EE0CEE718A45E8B47CB960BD5907D0E843E8A8E7D4698363C3C3FB3ADC512368B72CAF16510C69052EA2AF51BE00BC8CA04DF1F00A00CC2CA4D74254A1E8738460FD244DDB446CB36554B0A24EEF3710E44DBCF39881E7D3F9AE223388084E7A49A3CB12612AE36416C0EB5628DF1477FEE4A5CF77CDC09AA0E2C989C0B7D1310AFA44B81DA79A65226C7EA510057991EABF9388DC5EA9F52FEA5D3B0872843F50878740794E523E9DC60E0EA1FC8746A7B2AA31FCA89AAA2FA907BED116C69D98F912DD5089BECF28577064225DE96FC214ED1794E7CCE8024F94036D915A123A464C951DA96A5ED7F286F205BEE71BDE2D133FD1891B31178FF25D31611A5B7839F0E68EAF0F8901A571E6917C580F31842A9F19C47E0638483B7947DDCD7864660AC2F8B2C430F1E7FC0F22FA51F96F0499332C5AD3FF9DC7F4332DD5BCCA820CC779B90C0F4C5F0CA52E96FAA187361753FBADC5C80D0492CD80A3EEA5D578772DA9FC1C0E10A0203098AF36D0ED2156BA7321EB},
+     {6143, 5, 16#FD9E6B52785CD7BE64D396A599DA4B97CD0BB49183F932A97694D80CA553354DBC26E77B8A0EC002257AADDF6AD27819CE64A06416E4A80B6EA92F28EA8D5B96C774109EEE5816B4B18F84368D1B41864C11AA73D6881675D779B174F6B4E344303F3EFD11BD7DE468467242372FD00908F296F5A2B20E2684F9122D08A46D647B05E298F0BCDAB60468349CCA6DA1B9FEBBC69D256FB9A3F1980F68466364FCEF1C98C1405191A6737A3627BA7F7313A8A18FC0B8521BF3430B1C6805CB44BCEB39904DD30130D24B225B598ED83C5FD757B80189FD9D5C2F9596687C40BAB1C6ED6244944629849D074A4C33FB15DDB3F9760FC59C44BEBB0EC032177147F61789769DAAAE2123CE488F7ECF19BDA051925BA9ED11EAA72DF70C9ECC8F714B4C35728E6679E66A1B56CCAE0FBBD3F9EBF950D4D623ED78E77CC3AD604E91F304EA78CE876F036214BD6F1977BD04C9ADD707D7A3BCCE87AD5D5A11C95E7025B0EA9C649DCB37942A3970A4FB04C284E4DDB4DC90163353B98B1C254FFD28443353F17A87C02E0BDB9F05424CC44C86309F1D73706F039CDAAC3EDC1A64F38FB42707D351DB5360C2680ADC1CC8D1C4AD312ACC904382C26BE33DA0E61429A5940820356ED28586BEB629ED1521D12D25B4DA01926295F3DA504DC9F431B719AC63277BE675E6F6DD4F7499CA11A23744577D653941963E8DAB610F7F226DB52CE5C683F72AEED2B6CE35ED07C29410397A6F7F606477CCC0EDE18CD0D96A7863BC4606193A8799B5AC1EEE6AC5EE36AC3077EC8DAB30EE94434B45B78BC13D96F74D6C4056EAA528CD3C68D308344808819B12F2BFB95A5C1A7DEEE188BF139216DDB7D757D7A50D3C46CE18881D776D617DCFFAA62276045373AA4D9446D7570338F99C0CA8A08851B4F9D388B4C275D3F9B7BA25F235D4329F63F7457C2EB5C68CE2A96D19766F0ED8E19F66DF3C5E29A38795B2F92291BB6EAB6F70A7E89DC9691F28486E9CF87FF11D5DF2E6B030A30B5D476AD59A34EE7262712ED96CEF4A5CAC3F08B3563D44683F746DA094C9CDB34427AF8D8CC2AE1B23C3BEB637},
+     {8191, 2, 16#DC61EF13E4F3FC10CC946EEABC33F83EFCB35E0F47E4EC25C1CCBB2C7B502B2EFB0691AA231C8476DD51BA73204E6EA10B1A970FE2CF14AF01E72E1AEA87519A91D00D1499189F94A6CDA9E29C05F11F17FE74A4919A710A2787E180744465DF81C62AA65662FDA46FA6175E8A31E5B29E66DED6701C8FC4217E91D733FE94380F046680967D4CEA7BAC8F3916CDF96AA2C474FAD9650F48403FD0B5B756D34667D36A07767FA33027AE55484D0F701C3CA16632F413A14E4B8645AFAF15B78978C19A7661EDC569BEC72394B1204B166A48FCD5F56BE29840C7794CA6D3440356F15858CDCA9B429C7EA92E17242893FDC8C9C63841A382C32F20CFAB121B4BCAFD7BF9EF07FBF7CDFFECA0CEF3A49C3E2B24FA836F3318435255655E1B281071F62D5E4CD63361299B7828F72936E3FEA9E8044562A6F6ADD5321187C3101E4669C6271598FE1A866C93FE2870A4CEB9254BA32A4719E439317EA42200A335B5CFFA7946A7D0F1BD1A69AA11288B73C71C80B77FE3707CB077DDDEA5CA36A449FAB230C9625A0B12F8275D3FF82F5DA380E7A3F11B6F155FE7E91AC960BD95D9B13F7423AB9B15CC3C4DC34EF296033F009468EA16A721AD659F56C18516025050749ABF05E6D3EBD9778142A530979291F46DAA399A86B7BCDF09CC3E6EEF101419762A306DB45AEFC96C64E83F28338D55905F6A387E0F515E580C3A9B35330E21C32198CDEE3AFB355967A098F635FCA7C49CB4E1E82464B2B390EF1F259E40B9A06235C0273F76284FE6BD534EF3AF7CB01A4A5252B8B94CADC2850B2E56D53F9A31D7C029DF967D0A30C05BC64E119BED6076818FABC8CDD93F3255693E14EFC1A740A5D63A5E847FFE87BAB1DDE0506E1762EA61EFA9F9756151ECCCADD91B98A961A901A2D8B01ABDDD29EC804E8C8D28214BBA26048F924CA66316696E51A49D02FF034D20E44914B1115339CAD3819E0CB1640F0084886FEDDE5E28C29DC48ED30A8C3D789734338F5A9DF42584326E536FD1CF30BC85B8DCBD6120D127C98FE4B3614074F13C2CA4854E6D794156C185C40EB3DA7619CE96ADAF0941BD5499848B034C2B11DFECC0BDFA81C594241F759EF53FC7CDE7F2DE4F23CF81A5A0B7D62E31DABB9198D40307F7824DD130B7D1B80E9B6D322FEEDB5ACE34944F0BFB7D016762A9B2E173BFDD69303766AFBAB45FAB75D05430B4A3515858C4B7F04E23414E4AD03842CB0A20D8FF4B59B7C852BA9A5BE982A8ADA5CB70C36CE2A4D2C31A7015C9F3275E43D192C1B2924424088907A057DA7F2D32A2149922AB2E33F2147D637A3508911CB3FEA5E1AAB4525BACF27B6DD7A3E0AFA978FC3A39DE8882FB22688C3CCC92B6E69ACB0BBF575AB3368E51A2F6A20C414C6F146727CC0045F29061E695D29F7C030CE6929EB3AD11A5CBD0CDEE37347869A3}].
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index ed76f4f795..2db55b97b4 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -541,7 +541,6 @@ default_algorithms(sshc, DaemonOptions) ->
 	    ct:fail("No server respons 2")
     end.
 
-
 run_fake_ssh({ok,InitialState}) ->
     KexInitPattern =
 	#ssh_msg_kexinit{
@@ -583,6 +582,40 @@ run_fake_ssh({ok,InitialState}) ->
 		    {server2client, to_atoms(CompS2C)}]}].
     
 
+%%%----------------------------------------------------------------
+extract_algos(Spec) ->
+    [{Tag,get_atoms(List)} || {Tag,List} <- Spec].
+
+get_atoms(L) ->
+    lists:usort(
+      [ A || X <- L,
+	     A <- case X of
+		      {_,L1} when is_list(L1) -> L1;
+		      Y when is_atom(Y) -> [Y]
+		  end]).
+
+
+intersection(AlgoSpec1, AlgoSpec2) -> intersect(sort_spec(AlgoSpec1), sort_spec(AlgoSpec2)).
+
+intersect([{Tag,S1}|Ss1], [{Tag,S2}|Ss2]) ->
+    [{Tag,intersect(S1,S2)} | intersect(Ss1,Ss2)];
+intersect(L1=[A1|_], L2=[A2|_]) when is_atom(A1),is_atom(A2) -> 
+    Diff = L1 -- L2,
+    L1 -- Diff;
+intersect(_, _) -> 
+    [].
+
+intersect_bi_dir([{Tag,[{client2server,L1},{server2client,L2}]}|T]) ->
+    [{Tag,intersect(L1,L2)} | intersect_bi_dir(T)];
+intersect_bi_dir([H={_,[A|_]}|T]) when is_atom(A) ->
+    [H | intersect_bi_dir(T)];
+intersect_bi_dir([]) ->
+    [].
+    
+
+sort_spec(L = [{_,_}|_] ) ->  [{Tag,sort_spec(Es)} || {Tag,Es} <- L];
+sort_spec(L) -> lists:usort(L).
+
 %%--------------------------------------------------------------------
 sshc(Tag) -> 
     to_atoms(