Send KEXINIT without waiting from server.

4 files changed, 9 insertions, 2 deletions

diff --git a/lib/net/ssh/test/socket.rb b/lib/net/ssh/test/socket.rb
index 76ff18e..877aad4 100644
--- a/lib/net/ssh/test/socket.rb
+++ b/lib/net/ssh/test/socket.rb
@@ -25,8 +25,8 @@ module Net; module SSH; module Test
 
       @script = Script.new
 
-      script.gets(:kexinit, 1, 2, 3, 4, "test", "ssh-rsa", "none", "none", "none", "none", "none", "none", "", "", false)
       script.sends(:kexinit)
+      script.gets(:kexinit, 1, 2, 3, 4, "test", "ssh-rsa", "none", "none", "none", "none", "none", "none", "", "", false)
       script.sends(:newkeys)
       script.gets(:newkeys)
     end
diff --git a/lib/net/ssh/transport/algorithms.rb b/lib/net/ssh/transport/algorithms.rb
index 6260473..861b193 100644
--- a/lib/net/ssh/transport/algorithms.rb
+++ b/lib/net/ssh/transport/algorithms.rb
@@ -116,6 +116,12 @@ module Net; module SSH; module Transport
       prepare_preferred_algorithms!
     end
 
+    # Start the algorithm negotation
+    def start
+      raise ArgumentError, "Cannot call start if it's negoitation started or done" if @pending || @initialized
+      send_kexinit
+    end
+
     # Request a rekey operation. This will return immediately, and does not
     # actually perform the rekey operation. It does cause the session to change
     # state, however--until the key exchange finishes, no new packets will be
diff --git a/lib/net/ssh/transport/session.rb b/lib/net/ssh/transport/session.rb
index a8b303a..f4905a6 100644
--- a/lib/net/ssh/transport/session.rb
+++ b/lib/net/ssh/transport/session.rb
@@ -84,6 +84,7 @@ module Net; module SSH; module Transport
       @server_version = ServerVersion.new(socket, logger, options[:timeout])
 
       @algorithms = Algorithms.new(self, options)
+      @algorithms.start
       wait { algorithms.initialized? }
     rescue Errno::ETIMEDOUT
       raise Net::SSH::ConnectionTimeout
diff --git a/test/transport/test_session.rb b/test/transport/test_session.rb
index 205908e..af354ca 100644
--- a/test/transport/test_session.rb
+++ b/test/transport/test_session.rb
@@ -309,7 +309,7 @@ module Transport
       end
 
       def algorithms
-        @algorithms ||= stub("algorithms", :initialized? => true, :allow? => true)
+        @algorithms ||= stub("algorithms", :initialized? => true, :allow? => true, :start => true)
       end
 
       def session(options={})