Merge branch 'hans/ssh/optimize/OTP-14160'

2 files changed, 26 insertions, 34 deletions

diff --git a/lib/ssh/src/ssh_bits.erl b/lib/ssh/src/ssh_bits.erl
index 8bedaaf0c5..3ce7758447 100644
--- a/lib/ssh/src/ssh_bits.erl
+++ b/lib/ssh/src/ssh_bits.erl
@@ -30,39 +30,31 @@
 -export([random/1]).
 
 %%%----------------------------------------------------------------
-name_list([Name]) -> to_bin(Name);
-name_list([Name|Ns]) -> <<(to_bin(Name))/binary, ",", (name_list(Ns))/binary>>;
-name_list([]) -> <<>>.
-
-to_bin(A) when is_atom(A) -> list_to_binary(atom_to_list(A));
-to_bin(S) when is_list(S) -> list_to_binary(S);
-to_bin(B) when is_binary(B) -> B.
+name_list(NamesList) -> list_to_binary(lists:join($,, NamesList)).
 
 %%%----------------------------------------------------------------
 %%% Multi Precision Integer encoding
 mpint(-1) -> <<0,0,0,1,16#ff>>;
 mpint(0) -> <<0,0,0,0>>;
-mpint(X) when X < 0 -> mpint_neg(X,0,[]);
-mpint(X) -> mpint_pos(X,0,[]).
-    
-mpint_neg(-1,I,Ds=[MSB|_]) ->
-    if MSB band 16#80 =/= 16#80 ->
-	    <<?UINT32((I+1)), (list_to_binary([255|Ds]))/binary>>;
-       true ->
-	    <<?UINT32(I), (list_to_binary(Ds))/binary>>
-    end;
-mpint_neg(X,I,Ds)  ->
-    mpint_neg(X bsr 8,I+1,[(X band 255)|Ds]).
-    
-mpint_pos(0,I,Ds=[MSB|_]) ->
-    if MSB band 16#80 == 16#80 ->
-	    <<?UINT32((I+1)), (list_to_binary([0|Ds]))/binary>>;
-       true ->
-	    <<?UINT32(I), (list_to_binary(Ds))/binary>>
+mpint(I) when I>0 ->
+    <<B1,V/binary>> = binary:encode_unsigned(I),
+    case B1 band 16#80 of
+	16#80 ->
+	    <<(size(V)+2):32/unsigned-big-integer, 0,B1,V/binary >>;
+	_ ->
+	    <<(size(V)+1):32/unsigned-big-integer, B1,V/binary >>
     end;
-mpint_pos(X,I,Ds) ->
-    mpint_pos(X bsr 8,I+1,[(X band 255)|Ds]).
-
+mpint(N) when N<0 -> 
+    Sxn =  8*size(binary:encode_unsigned(-N)),
+    Sxn1 = Sxn+8,
+    <<W:Sxn1>> = <<1, 0:Sxn>>,
+    <<B1,V/binary>> = binary:encode_unsigned(W+N),
+    case B1 band 16#80 of
+	16#80 ->
+	    <<(size(V)+1):32/unsigned-big-integer, B1,V/binary >>;
+	_ ->
+	    <<(size(V)+2):32/unsigned-big-integer, 255,B1,V/binary >>
+    end.
 
 %%%----------------------------------------------------------------
 %% random/1
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index 21ba34506a..53e9ef485b 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -367,7 +367,7 @@ handle_kexdh_init(#ssh_msg_kexdh_init{e = E},
 						h_sig = H_SIG
 					       }, Ssh0),
 	    {ok, SshPacket, Ssh1#ssh{keyex_key = {{Private, Public}, {G, P}},
-				     shared_secret = K,
+				     shared_secret = ssh_bits:mpint(K),
 				     exchanged_hash = H,
 				     session_id = sid(Ssh1, H)}};
 
@@ -393,7 +393,7 @@ handle_kexdh_reply(#ssh_msg_kexdh_reply{public_host_key = PeerPubHostKey,
 	    case verify_host_key(Ssh0, PeerPubHostKey, H, H_SIG) of
 		ok ->
 		    {SshPacket, Ssh} = ssh_packet(#ssh_msg_newkeys{}, Ssh0),
-		    {ok, SshPacket, Ssh#ssh{shared_secret  = K,
+		    {ok, SshPacket, Ssh#ssh{shared_secret  = ssh_bits:mpint(K),
 					    exchanged_hash = H,
 					    session_id = sid(Ssh, H)}};
 		Error ->
@@ -532,7 +532,7 @@ handle_kex_dh_gex_init(#ssh_msg_kex_dh_gex_init{e = E},
 			ssh_packet(#ssh_msg_kex_dh_gex_reply{public_host_key = MyPubHostKey,
 							     f = Public,
 							     h_sig = H_SIG}, Ssh0),
-		    {ok, SshPacket, Ssh#ssh{shared_secret = K,
+		    {ok, SshPacket, Ssh#ssh{shared_secret = ssh_bits:mpint(K),
 					    exchanged_hash = H,
 					    session_id = sid(Ssh, H)
 					   }};
@@ -568,7 +568,7 @@ handle_kex_dh_gex_reply(#ssh_msg_kex_dh_gex_reply{public_host_key = PeerPubHostK
 		    case verify_host_key(Ssh0, PeerPubHostKey, H, H_SIG) of
 			ok ->
 			    {SshPacket, Ssh} = ssh_packet(#ssh_msg_newkeys{}, Ssh0),
-			    {ok, SshPacket, Ssh#ssh{shared_secret  = K,
+			    {ok, SshPacket, Ssh#ssh{shared_secret  = ssh_bits:mpint(K),
 						    exchanged_hash = H,
 						    session_id = sid(Ssh, H)}};
 			_Error ->
@@ -618,7 +618,7 @@ handle_kex_ecdh_init(#ssh_msg_kex_ecdh_init{q_c = PeerPublic},
 						   h_sig = H_SIG},
 			   Ssh0),
     	    {ok, SshPacket, Ssh1#ssh{keyex_key = {{MyPublic,MyPrivate},Curve},
-				     shared_secret = K,
+				     shared_secret = ssh_bits:mpint(K),
 				     exchanged_hash = H,
 				     session_id = sid(Ssh1, H)}}
     catch
@@ -644,7 +644,7 @@ handle_kex_ecdh_reply(#ssh_msg_kex_ecdh_reply{public_host_key = PeerPubHostKey,
 	    case verify_host_key(Ssh0, PeerPubHostKey, H, H_SIG) of
 		ok ->
 		    {SshPacket, Ssh} = ssh_packet(#ssh_msg_newkeys{}, Ssh0),
-		    {ok, SshPacket, Ssh#ssh{shared_secret  = K,
+		    {ok, SshPacket, Ssh#ssh{shared_secret  = ssh_bits:mpint(K),
 					    exchanged_hash = H,
 					    session_id = sid(Ssh, H)}};
 		Error ->
@@ -1577,7 +1577,7 @@ hash(SSH, Char, Bits) ->
 hash(_SSH, _Char, 0, _HASH) ->
     <<>>;
 hash(SSH, Char, N, HASH) ->
-    K = ssh_bits:mpint(SSH#ssh.shared_secret),
+K = SSH#ssh.shared_secret, %    K = ssh_bits:mpint(SSH#ssh.shared_secret),
     H = SSH#ssh.exchanged_hash,
     SessionID = SSH#ssh.session_id,
     K1 = HASH([K, H, Char, SessionID]),