File 0151-ssh-Change-22-SSH_DEFAULT_PORT.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0151-ssh-Change-22-SSH_DEFAULT_PORT.patch of Package erlang (Revision 146c22f3078afb21ca566b2f59ce9bb4)

Currently displaying revision 146c22f3078afb21ca566b2f59ce9bb4 , Show latest

From 6332044f85858ba068fa6286cd3d393523612f90 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Thu, 20 May 2021 21:47:45 +0200
Subject: [PATCH 1/4] ssh: Change 22 -> ?SSH_DEFAULT_PORT

---
 lib/ssh/test/ssh_algorithms_SUITE.erl |  3 ++-
 lib/ssh/test/ssh_connection_SUITE.erl |  3 +--
 lib/ssh/test/ssh_options_SUITE.erl    |  9 +++++----
 lib/ssh/test/ssh_test_lib.erl         |  9 +++++----
 lib/ssh/test/ssh_test_lib.hrl         |  8 ++++++++
 lib/ssh/test/ssh_to_openssh_SUITE.erl | 10 +++++-----
 6 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index 2ee8fd24bd..21d7c92236 100644
--- a/lib/ssh/test/ssh_algorithms_SUITE.erl
+++ b/lib/ssh/test/ssh_algorithms_SUITE.erl
@@ -393,7 +393,8 @@ sshd_simple_exec(Config) ->
             {public_key,Alg} -> [{pref_public_key_algs,Alg}];
             _ -> []
         end,
-    ConnectionRef = ssh_test_lib:connect(22, [{silently_accept_hosts, true},
+    ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT,
+                                             [{silently_accept_hosts, true},
                                               proplists:get_value(pref_algs,Config),
 					      {user_interaction, false}
                                               | ClientPubKeyOpts]),
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index 9daa887f6c..f97e4326da 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -91,7 +91,6 @@
          ssh_exec_echo/2 % called as an MFA
         ]).
 
--define(SSH_DEFAULT_PORT, 22).
 -define(EXEC_TIMEOUT, 10000).
 
 %%--------------------------------------------------------------------
@@ -174,7 +173,7 @@ end_per_suite(_Config) ->
 
 %%--------------------------------------------------------------------
 init_per_group(openssh, Config) ->
-    case ssh_test_lib:gen_tcp_connect("localhost", 22, []) of
+    case ssh_test_lib:gen_tcp_connect("localhost", ?SSH_DEFAULT_PORT, []) of
 	{error,econnrefused} ->
 	    {skip,"No openssh deamon (econnrefused)"};
 	{ok, Socket} ->
diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl
index f53f06c458..88b3d09eba 100644
--- a/lib/ssh/test/ssh_options_SUITE.erl
+++ b/lib/ssh/test/ssh_options_SUITE.erl
@@ -1634,9 +1634,10 @@ config_file(Config) ->
                       {_,[Ch1]}]} | _] = R1,
 
             %% First connection. The client_options should be applied:
-            {ok,C1} = rpc:call(Node, ssh, connect, [loopback, 22, [{silently_accept_hosts, true},
-                                                                   {user_interaction, false}
-                                                                  ]]),
+            {ok,C1} = rpc:call(Node, ssh, connect, [loopback, ?SSH_DEFAULT_PORT,
+                                                    [{silently_accept_hosts, true},
+                                                     {user_interaction, false}
+                                                    ]]),
             ct:log("C1 = ~n~p", [C1]),
             {algorithms,As1} = rpc:call(Node, ssh, connection_info, [C1, algorithms]),
             K1b = proplists:get_value(kex, As1),
@@ -1651,7 +1652,7 @@ config_file(Config) ->
                        {silently_accept_hosts, true},
                        {user_interaction, false}
                       ],
-            {ok,C2} = rpc:call(Node, ssh, connect, [loopback, 22, C2_Opts]),
+            {ok,C2} = rpc:call(Node, ssh, connect, [loopback, ?SSH_DEFAULT_PORT, C2_Opts]),
             {algorithms,As2} = rpc:call(Node, ssh, connection_info, [C2, algorithms]),
             K2a = proplists:get_value(kex, As2),
             Ch1 = proplists:get_value(encrypt, As2),
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index 19cd60708a..c6061c400c 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -528,10 +528,11 @@ do_del_files(Dir, Files) ->
 
 openssh_sanity_check(Config) ->
     ssh:start(),
-    case ssh:connect("localhost", 22, [{password,""},
-                                       {silently_accept_hosts, true},
-                                       {user_interaction, false}
-                                      ]) of
+    case ssh:connect("localhost", ?SSH_DEFAULT_PORT,
+                     [{password,""},
+                      {silently_accept_hosts, true},
+                      {user_interaction, false}
+                     ]) of
 	{ok, Pid} ->
 	    ssh:close(Pid),
 	    ssh:stop(),
diff --git a/lib/ssh/test/ssh_test_lib.hrl b/lib/ssh/test/ssh_test_lib.hrl
index 0e36793955..c7219e3f70 100644
--- a/lib/ssh/test/ssh_test_lib.hrl
+++ b/lib/ssh/test/ssh_test_lib.hrl
@@ -1,3 +1,11 @@
+
+%%-------------------------------------------------------------------------
+%% Default system port
+%%-------------------------------------------------------------------------
+-ifndef(SSH_DEFAULT_PORT).
+-define(SSH_DEFAULT_PORT, 22).
+-endif.
+
 %%-------------------------------------------------------------------------
 %% Timeout time in ms
 %%-------------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index 96072cb1b6..813a72090d 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -50,7 +50,6 @@
 
         ]).
 
--define(SSH_DEFAULT_PORT, 22).
 -define(REKEY_DATA_TMO, 65000).
 
 %%--------------------------------------------------------------------
@@ -89,7 +88,7 @@ groups() ->
 
 init_per_suite(Config) ->
     ?CHECK_CRYPTO(
-       case gen_tcp:connect("localhost", 22, []) of
+       case gen_tcp:connect("localhost", ?SSH_DEFAULT_PORT, []) of
 	   {error,econnrefused} ->
 	       {skip,"No openssh deamon (econnrefused)"};
 	   _ ->
@@ -370,8 +369,9 @@ tunnel_in_erlclient_erlserver(Config) ->
 
 %%--------------------------------------------------------------------
 tunnel_in_erlclient_openssh_server(_Config) ->
-    C = ssh_test_lib:connect(loopback, 22, [{silently_accept_hosts, true},
-                                            {user_interaction, false}]),
+    C = ssh_test_lib:connect(loopback, ?SSH_DEFAULT_PORT,
+                             [{silently_accept_hosts, true},
+                              {user_interaction, false}]),
     {ToSock, ToHost, ToPort} = tunneling_listner(),
     
     ListenHost = {127,0,0,1},
@@ -401,7 +401,7 @@ tunnel_out_erlclient_erlserver(Config) ->
 
 %%--------------------------------------------------------------------
 tunnel_out_erlclient_openssh_server(_Config) ->
-    C = ssh_test_lib:connect(loopback, 22, [{silently_accept_hosts, true},
+    C = ssh_test_lib:connect(loopback, ?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
                                             {user_interaction, false}]),
     {ToSock, ToHost, ToPort} = tunneling_listner(),
     
-- 
2.26.2

Places

File 0151-ssh-Change-22-SSH_DEFAULT_PORT.patch of Package erlang (Revision 146c22f3078afb21ca566b2f59ce9bb4)

Places