0
@@ -1,3 +1,8 @@
0
+=== *unreleased*
0
+
0
+* Use #chomp instead of #strip when cleaning the version string reported by the remote host, so that trailing whitespace is preserved (this is to play nice with servers like Mocana SSH) [Timo Gatsonides]
0
+
0
+
0
 === 2.0.2 / 29 May 2008
0
 
0
 * Make sure the agent client understands both RSA "identities answers" [Jamis Buck]

0
@@ -46,15 +46,14 @@ module Net; module SSH; module Transport
0
           @header << @version
0
         end
0
 
0
-        debug { "remote is #{@version.strip}" }
0
+        @version.chomp!
0
+        debug { "remote is `#{@version}'" }
0
 
0
         unless @version.match(/^SSH-(1\.99|2\.0)-/)
0
           raise Net::SSH::Exception, "incompatible SSH version `#{@version}'"
0
         end
0
 
0
-        @version.strip!
0
-
0
-        debug { "local is #{PROTO_VERSION}" }
0
+        debug { "local is `#{PROTO_VERSION}'" }
0
         socket.write "#{PROTO_VERSION}\r\n"
0
       end
0
   end

0
@@ -17,9 +17,11 @@ module Transport
0
       assert_equal "SSH-2.0-Testing_1.0", s.version
0
     end
0
 
0
-    def test_trailing_whitespace_should_be_stripped
0
+    def test_trailing_whitespace_should_be_preserved
0
+      # some servers, like Mocana, send a version string with trailing
0
+      # spaces, which are significant when exchanging keys later.
0
       s = subject(socket(true, "SSH-2.0-Testing_1.0    \r\n"))
0
-      assert_equal "SSH-2.0-Testing_1.0", s.version
0
+      assert_equal "SSH-2.0-Testing_1.0    ", s.version
0
     end
0
 
0
     def test_unacceptible_server_version_should_raise_exception