Merge branch 'maint'

Author: u3s

lib/ssh/test/ssh_connection_SUITE.erl

@@ -769,6 +769,19 @@ do_interrupted_send(Config, SendSize, EchoSize, SenderResult) ->
 			    ct:log("~p:~p ~p - That's what we expect :)",
                                    [?MODULE,?LINE, SenderResult]),
 			    ok;
+                        {SenderPid, {error, closed}} ->
+                            %% We called ssh:close(ConnectionRef) above while
+                            %% the sender was still pushing data (10 MB send,
+                            %% only 4 MB echoed). The connection teardown can
+                            %% race with the ongoing send, causing it to return
+                            %% {error, closed} instead of ok. Both outcomes are
+                            %% valid — the test's purpose is to verify the
+                            %% listener received correct echo data, not that
+                            %% the sender completes the full 10 MB transfer.
+                            ct:log("~p:~p sender got {error,closed} after "
+                                   "ssh:close - acceptable race",
+                                   [?MODULE,?LINE]),
+                            ok;
 			Msg ->
 			    ct:log("~p:~p Not expected send result: ~p",[?MODULE,?LINE,Msg]),
 			    {fail, "Not expected msg"}

lib/ssh/test/ssh_protocol_SUITE.erl

@@ -1396,8 +1396,14 @@ kex_strict_violation(Config) ->
            {send, ssh_msg_kexinit},
            {match, #ssh_msg_kexinit{_='_'}, receive_msg},
            {send, ssh_msg_kexdh_init_dup},
-           {match,# ssh_msg_kexdh_reply{_='_'}, receive_msg},
-           {match, disconnect(?SSH_DISCONNECT_KEY_EXCHANGE_FAILED), receive_msg}]},
+           {match, #ssh_msg_kexdh_reply{_='_'}, receive_msg},
+           %% Server processes first kexdh_init (sends newkeys), then
+           %% detects the duplicate and disconnects. Depending on timing
+           %% we may see newkeys, disconnect, or tcp_closed here.
+           %% The actual violation assertion is verified via event_logged.
+           {match, {'or', [#ssh_msg_newkeys{_='_'},
+                           #ssh_msg_disconnect{code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED},
+                           tcp_closed]}, receive_msg}]},
          {new_keys, "Message ssh_msg_newkeys in wrong state",
           [receive_hello,
            {send, hello},