net-ssh 2.0.4 → 2.0.5

data/CHANGELOG.rdoc

@@ -1,3 +1,14 @@
+=== 2.0.5 / 6 December 2008
+
+* Make the Pageant interface comply with more of the Socket interface to avoid related errors [Jamis Buck]
+
+* Don't busy-wait on session close for remaining channels to close [Will Bryant]
+
+* Ruby 1.9 compatibility [Jamis Buck]
+
+* Fix Cipher#final to correctly flag a need for a cipher reset [Jamis Buck]
+
+
 === 2.0.4 / 27 Aug 2008
 
 * Added Connection::Session#closed? and Transport::Session#closed? [Jamis Buck]

data/lib/net/ssh/authentication/pageant.rb

@@ -156,6 +156,13 @@ module Net; module SSH; module Authentication
         @pos = 0
       end
 
+      # Conceptually asks if the socket is closed. As with #close,
+      # this doesn't really do anything significant, but merely
+      # complies with the Socket interface.
+      def closed?
+        @res.nil? && @pos.zero?
+      end
+
       # Reads +n+ bytes from the cached result of the last query. If +n+
       # is +nil+, returns all remaining data from the last query.
       def read(n = nil)

data/lib/net/ssh/buffer.rb

@@ -1,3 +1,4 @@
+require 'net/ssh/ruby_compat'
 require 'net/ssh/transport/openssl'
 
 module Net; module SSH
@@ -203,7 +204,7 @@ module Net; module SSH
     # the end of the buffer.
     def read_byte
       b = read(1) or return nil
-      b[0]
+      b.getbyte(0)
     end
 
     # Read and return an SSH2-encoded string. The string starts with a long

data/lib/net/ssh/connection/session.rb

@@ -96,7 +96,7 @@ module Net; module SSH; module Connection
     def close
       info { "closing remaining channels (#{channels.length} open)" }
       channels.each { |id, channel| channel.close }
-      loop(0) { channels.any? }
+      loop { channels.any? }
       transport.close
     end
 
@@ -178,7 +178,7 @@ module Net; module SSH; module Connection
       return false unless preprocess(&block)
 
       r = listeners.keys
-      w = r.select { |w| w.respond_to?(:pending_write?) && w.pending_write? }
+      w = r.select { |w2| w2.respond_to?(:pending_write?) && w2.pending_write? }
       readers, writers, = IO.select(r, w, nil, wait)
 
       postprocess(readers, writers)
@@ -302,17 +302,17 @@ module Net; module SSH; module Connection
         channel.exec(command) do |ch, success|
           raise "could not execute command: #{command.inspect}" unless success
           
-          channel.on_data do |ch, data|
+          channel.on_data do |ch2, data|
             if block
-              block.call(ch, :stdout, data)
+              block.call(ch2, :stdout, data)
             else
               $stdout.print(data)
             end
           end
 
-          channel.on_extended_data do |ch, type, data|
+          channel.on_extended_data do |ch2, type, data|
             if block
-              block.call(ch, :stderr, data)
+              block.call(ch2, :stderr, data)
             else
               $stderr.print(data)
             end

data/lib/net/ssh/proxy/socks5.rb

@@ -1,4 +1,5 @@
 require 'socket'
+require 'net/ssh/ruby_compat'
 require 'net/ssh/proxy/errors'
 
 module Net
@@ -95,7 +96,7 @@ module Net
           socket.send packet, 0
 
           version, reply, = socket.recv(4).unpack("C*")
-          len = socket.recv(1)[0]
+          len = socket.recv(1).getbyte(0)
           socket.recv(len + 2)
 
           unless reply == SUCCESS

data/lib/net/ssh/service/forward.rb

@@ -64,12 +64,12 @@ module Net; module SSH; module Service
 
       @local_forwarded_ports[[local_port, bind_address]] = socket
 
-      session.listen_to(socket) do |socket|
-        client = socket.accept
+      session.listen_to(socket) do |server|
+        client = server.accept
         debug { "received connection on #{bind_address}:#{local_port}" }
 
-        channel = session.open_channel("direct-tcpip", :string, remote_host, :long, remote_port, :string, bind_address, :long, local_port) do |channel|
-          channel.info { "direct channel established" }
+        channel = session.open_channel("direct-tcpip", :string, remote_host, :long, remote_port, :string, bind_address, :long, local_port) do |achannel|
+          achannel.info { "direct channel established" }
         end
 
         prepare_client(client, channel, :local)
@@ -177,12 +177,12 @@ module Net; module SSH; module Service
       return if @agent_forwarded
       @agent_forwarded = true
 
-      channel.send_channel_request("auth-agent-req@openssh.com") do |channel, success|
+      channel.send_channel_request("auth-agent-req@openssh.com") do |achannel, success|
         if success
           debug { "authentication agent forwarding is active" }
         else
-          channel.send_channel_request("auth-agent-req") do |channel, success|
-            if success
+          achannel.send_channel_request("auth-agent-req") do |a2channel, success2|
+            if success2
               debug { "authentication agent forwarding is active" }
             else
               error { "could not establish forwarding of authentication agent" }

data/lib/net/ssh/transport/cipher_factory.rb

@@ -18,6 +18,14 @@ module Net; module SSH; module Transport
       "none"                        => "none"
     }
 
+    # Returns true if the underlying OpenSSL library supports the given cipher,
+    # and false otherwise.
+    def self.supported?(name)
+      ossl_name = SSH_TO_OSSL[name] or raise NotImplementedError, "unimplemented cipher `#{name}'"
+      return true if ossl_name == "none"
+      return OpenSSL::Cipher.ciphers.include?(ossl_name)
+    end
+
     # Retrieves a new instance of the named algorithm. The new instance
     # will be initialized using an iv and key generated from the given
     # iv, key, shared, hash and digester values. Additionally, the

data/lib/net/ssh/transport/hmac/abstract.rb

@@ -6,29 +6,53 @@ module Net; module SSH; module Transport; module HMAC
   class Abstract
 
     class <<self
-      %w(key_length mac_length digest_class).each do |attribute|
-        define_method(attribute) do |*v|
-          # satisfy ruby -w
-          if !instance_variables.include?("@#{attribute}")
-            instance_variable_set("@#{attribute}", nil)
-          end
-
-          if v.empty?
-            v = instance_variable_get("@#{attribute}")
-            if v.nil? && superclass.respond_to?(attribute)
-              v = superclass.send(attribute)
-              instance_variable_set("@#{attribute}", v)
-            end
-            v
-          else
-            instance_variable_set("@#{attribute}", v.first)
-          end
+      def key_length(*v)
+        @key_length = nil if !defined?(@key_length)
+        if v.empty?
+          @key_length = superclass.key_length if @key_length.nil? && superclass.respond_to?(:key_length)
+          return @key_length
+        elsif v.length == 1
+          @key_length = v.first
+        else
+          raise ArgumentError, "wrong number of arguments (#{v.length} for 1)"
         end
       end
+
+      def mac_length(*v)
+        @mac_length = nil if !defined?(@mac_length)
+        if v.empty?
+          @mac_length = superclass.mac_length if @mac_length.nil? && superclass.respond_to?(:mac_length)
+          return @mac_length
+        elsif v.length == 1
+          @mac_length = v.first
+        else
+          raise ArgumentError, "wrong number of arguments (#{v.length} for 1)"
+        end
+      end
+
+      def digest_class(*v)
+        @digest_class = nil if !defined?(@digest_class)
+        if v.empty?
+          @digest_class = superclass.digest_class if @digest_class.nil? && superclass.respond_to?(:digest_class)
+          return @digest_class
+        elsif v.length == 1
+          @digest_class = v.first
+        else
+          raise ArgumentError, "wrong number of arguments (#{v.length} for 1)"
+        end
+      end
+    end
+
+    def key_length
+      self.class.key_length
+    end
+
+    def mac_length
+      self.class.mac_length
     end
 
-    %w(key_length mac_length digest_class).each do |attribute|
-      define_method(attribute) { self.class.send(attribute) }
+    def digest_class
+      self.class.digest_class
     end
 
     # The key in use for this instance.

data/lib/net/ssh/transport/identity_cipher.rb

@@ -39,6 +39,16 @@ module Net; module SSH; module Transport
       def name
         "identity"
       end
+
+      # Does nothing. Returns nil.
+      def iv=(v)
+        nil
+      end
+
+      # Does nothing. Returns self.
+      def reset
+        self
+      end
     end
   end
 

data/lib/net/ssh/transport/openssl.rb

@@ -15,7 +15,7 @@ module OpenSSL
         return [0].pack("N")
       else
         buf = to_s(2)
-        if buf[0][7] == 1
+        if buf.getbyte(0)[7] == 1
           return [buf.length+1, 0, buf].pack("NCA*")
         else
           return [buf.length, buf].pack("NA*")

data/lib/net/ssh/transport/packet_stream.rb

@@ -137,7 +137,7 @@ module Net; module SSH; module Transport
       encrypted_data = client.update_cipher(unencrypted_data) << client.final_cipher
       message = encrypted_data + mac
 
-      debug { "queueing packet nr #{client.sequence_number} type #{payload[0]} len #{packet_length}" }
+      debug { "queueing packet nr #{client.sequence_number} type #{payload.getbyte(0)} len #{packet_length}" }
       enqueue(message)
 
       client.increment(packet_length)
@@ -169,8 +169,8 @@ module Net; module SSH; module Transport
       # the states and generally prepares the object for use as a packet stream.
       def initialize_ssh
         @hints  = {}
-        @server = State.new(self)
-        @client = State.new(self)
+        @server = State.new(self, :server)
+        @client = State.new(self, :client)
         @packet = nil
         initialize_buffered_io
       end
@@ -218,7 +218,7 @@ module Net; module SSH; module Transport
         # try to decompress the payload, in case compression is active
         payload = server.decompress(payload)
 
-        debug { "received packet nr #{server.sequence_number} type #{payload[0]} len #{@packet_length}" }
+        debug { "received packet nr #{server.sequence_number} type #{payload.getbyte(0)} len #{@packet_length}" }
 
         server.increment(@packet_length)
         @packet = nil

data/lib/net/ssh/transport/state.rb

@@ -31,6 +31,12 @@ module Net; module SSH; module Transport
     # The number of data blocks processed since the last call to #reset!
     attr_reader :blocks
 
+    # The cipher algorithm in use for this socket endpoint.
+    attr_reader :cipher
+
+    # The role that this state plays (either :client or :server)
+    attr_reader :role
+
     # The maximum number of packets that this endpoint wants to process before
     # needing a rekey.
     attr_accessor :max_packets
@@ -45,15 +51,15 @@ module Net; module SSH; module Transport
 
     # Creates a new state object, belonging to the given socket. Initializes
     # the algorithms to "none".
-    def initialize(socket)
+    def initialize(socket, role)
       @socket = socket
+      @role = role
       @sequence_number = @packets = @blocks = 0
       @cipher = CipherFactory.get("none")
       @hmac = HMAC.get("none")
       @compression = nil
       @compressor = @decompressor = nil
-      @next_iv = nil
-      @cipher_needs_reset = false
+      @next_iv = ""
     end
 
     # A convenience method for quickly setting multiple values in a single
@@ -65,25 +71,16 @@ module Net; module SSH; module Transport
       reset!
     end
 
-    # The cipher algorithm in use for this socket endpoint.
-    def cipher
-      if @cipher_needs_reset
-        @cipher.reset
-        @cipher.iv = @next_iv
-        @cipher_needs_reset = false
-      end
-
-      @cipher
-    end
-
     def update_cipher(data)
-      @next_iv = data[-cipher.iv_len..-1]
-      cipher.update(data)
+      result = cipher.update(data)
+      update_next_iv(role == :client ? result : data)
+      return result
     end
 
     def final_cipher
-      @cipher_needs_reset
-      cipher.final
+      result = cipher.final
+      update_next_iv(role == :client ? result : "", true)
+      return result
     end
 
     # Increments the counters. The sequence number is incremented (and remapped
@@ -185,6 +182,20 @@ module Net; module SSH; module Transport
       max_packets && packets > max_packets ||
       max_blocks && blocks > max_blocks
     end
+
+    private
+
+      def update_next_iv(data, reset=false)
+        @next_iv << data
+        @next_iv = @next_iv[-cipher.iv_len..-1]
+
+        if reset
+          cipher.reset
+          cipher.iv = @next_iv
+        end
+
+        return data
+      end
   end
 
 end; end; end

data/lib/net/ssh/version.rb

@@ -51,7 +51,7 @@ module Net; module SSH
     MINOR = 0
 
     # The tiny component of this version of the Net::SSH library
-    TINY  = 4
+    TINY  = 5
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/net-ssh.gemspec

@@ -1,14 +1,10 @@
-
-# Gem::Specification for Net-ssh-2.0.4
-# Originally generated by Echoe
-
 Gem::Specification.new do |s|
   s.name = %q{net-ssh}
-  s.version = "2.0.4"
+  s.version = "2.0.5"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck"]
-  s.date = %q{2008-08-27}
+  s.date = %q{2008-12-06}
   s.description = %q{a pure-Ruby implementation of the SSH2 client protocol}
   s.email = %q{jamis@jamisbuck.org}
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/net/ssh/authentication/agent.rb", "lib/net/ssh/authentication/constants.rb", "lib/net/ssh/authentication/key_manager.rb", "lib/net/ssh/authentication/methods/abstract.rb", "lib/net/ssh/authentication/methods/hostbased.rb", "lib/net/ssh/authentication/methods/keyboard_interactive.rb", "lib/net/ssh/authentication/methods/password.rb", "lib/net/ssh/authentication/methods/publickey.rb", "lib/net/ssh/authentication/pageant.rb", "lib/net/ssh/authentication/session.rb", "lib/net/ssh/buffer.rb", "lib/net/ssh/buffered_io.rb", "lib/net/ssh/config.rb", "lib/net/ssh/connection/channel.rb", "lib/net/ssh/connection/constants.rb", "lib/net/ssh/connection/session.rb", "lib/net/ssh/connection/term.rb", "lib/net/ssh/errors.rb", "lib/net/ssh/key_factory.rb", "lib/net/ssh/known_hosts.rb", "lib/net/ssh/loggable.rb", "lib/net/ssh/packet.rb", "lib/net/ssh/prompt.rb", "lib/net/ssh/proxy/errors.rb", "lib/net/ssh/proxy/http.rb", "lib/net/ssh/proxy/socks4.rb", "lib/net/ssh/proxy/socks5.rb", "lib/net/ssh/service/forward.rb", "lib/net/ssh/test/channel.rb", "lib/net/ssh/test/extensions.rb", "lib/net/ssh/test/kex.rb", "lib/net/ssh/test/local_packet.rb", "lib/net/ssh/test/packet.rb", "lib/net/ssh/test/remote_packet.rb", "lib/net/ssh/test/script.rb", "lib/net/ssh/test/socket.rb", "lib/net/ssh/test.rb", "lib/net/ssh/transport/algorithms.rb", "lib/net/ssh/transport/cipher_factory.rb", "lib/net/ssh/transport/constants.rb", "lib/net/ssh/transport/hmac/abstract.rb", "lib/net/ssh/transport/hmac/md5.rb", "lib/net/ssh/transport/hmac/md5_96.rb", "lib/net/ssh/transport/hmac/none.rb", "lib/net/ssh/transport/hmac/sha1.rb", "lib/net/ssh/transport/hmac/sha1_96.rb", "lib/net/ssh/transport/hmac.rb", "lib/net/ssh/transport/identity_cipher.rb", "lib/net/ssh/transport/kex/diffie_hellman_group1_sha1.rb", "lib/net/ssh/transport/kex/diffie_hellman_group_exchange_sha1.rb", "lib/net/ssh/transport/kex.rb", "lib/net/ssh/transport/openssl.rb", "lib/net/ssh/transport/packet_stream.rb", "lib/net/ssh/transport/server_version.rb", "lib/net/ssh/transport/session.rb", "lib/net/ssh/transport/state.rb", "lib/net/ssh/verifiers/lenient.rb", "lib/net/ssh/verifiers/null.rb", "lib/net/ssh/verifiers/strict.rb", "lib/net/ssh/version.rb", "lib/net/ssh.rb", "README.rdoc", "THANKS.rdoc"]
@@ -27,38 +23,11 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if current_version >= 3 then
+      s.add_development_dependency(%q<echoe>, [">= 0"])
     else
+      s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
+    s.add_dependency(%q<echoe>, [">= 0"])
   end
 end
-
-
-# # Original Rakefile source (requires the Echoe gem):
-# 
-# require './lib/net/ssh/version'
-# 
-# begin
-#   require 'echoe'
-# rescue LoadError
-#   abort "You'll need to have `echoe' installed to use Net::SSH's Rakefile"
-# end
-# 
-# version = Net::SSH::Version::STRING.dup
-# if ENV['SNAPSHOT'].to_i == 1
-#   version << "." << Time.now.utc.strftime("%Y%m%d%H%M%S")
-# end
-# 
-# Echoe.new('net-ssh', version) do |p|
-#   p.changelog        = "CHANGELOG.rdoc"
-# 
-#   p.author           = "Jamis Buck"
-#   p.email            = "jamis@jamisbuck.org"
-#   p.summary          = "a pure-Ruby implementation of the SSH2 client protocol"
-#   p.url              = "http://net-ssh.rubyforge.org/ssh"
-# 
-#   p.need_zip         = true
-#   p.include_rakefile = true
-# 
-#   p.rdoc_pattern     = /^(lib|README.rdoc|CHANGELOG.rdoc|THANKS.rdoc)/
-# end

data/test/authentication/methods/test_hostbased.rb

@@ -25,11 +25,11 @@ module Authentication; module Methods
         assert_equal "sig-one", packet.read_string
         t.return(USERAUTH_FAILURE, :string, "hostbased,password")
 
-        t.expect do |t, packet|
-          assert_equal USERAUTH_REQUEST, packet.type
-          assert verify_userauth_request_packet(packet, keys.last)
-          assert_equal "sig-two", packet.read_string
-          t.return(USERAUTH_FAILURE, :string, "hostbased,password")
+        t.expect do |t2, packet2|
+          assert_equal USERAUTH_REQUEST, packet2.type
+          assert verify_userauth_request_packet(packet2, keys.last)
+          assert_equal "sig-two", packet2.read_string
+          t2.return(USERAUTH_FAILURE, :string, "hostbased,password")
         end
       end
 

data/test/authentication/methods/test_keyboard_interactive.rb

@@ -29,11 +29,11 @@ module Authentication; module Methods
       transport.expect do |t,packet|
         assert_equal USERAUTH_REQUEST, packet.type
         t.return(USERAUTH_INFO_REQUEST, :string, "", :string, "", :string, "", :long, 1, :string, "Password:", :bool, false)
-        t.expect do |t,packet|
-          assert_equal USERAUTH_INFO_RESPONSE, packet.type
-          assert_equal 1, packet.read_long
-          assert_equal "the-password", packet.read_string
-          t.return(USERAUTH_FAILURE, :string, "publickey")
+        t.expect do |t2,packet2|
+          assert_equal USERAUTH_INFO_RESPONSE, packet2.type
+          assert_equal 1, packet2.read_long
+          assert_equal "the-password", packet2.read_string
+          t2.return(USERAUTH_FAILURE, :string, "publickey")
         end
       end
 
@@ -44,9 +44,9 @@ module Authentication; module Methods
       transport.expect do |t,packet|
         assert_equal USERAUTH_REQUEST, packet.type
         t.return(USERAUTH_INFO_REQUEST, :string, "", :string, "", :string, "", :long, 1, :string, "Password:", :bool, false)
-        t.expect do |t,packet|
-          assert_equal USERAUTH_INFO_RESPONSE, packet.type
-          t.return(USERAUTH_SUCCESS)
+        t.expect do |t2,packet2|
+          assert_equal USERAUTH_INFO_RESPONSE, packet2.type
+          t2.return(USERAUTH_SUCCESS)
         end
       end
 
@@ -57,12 +57,12 @@ module Authentication; module Methods
       transport.expect do |t,packet|
         assert_equal USERAUTH_REQUEST, packet.type
         t.return(USERAUTH_INFO_REQUEST, :string, "", :string, "", :string, "", :long, 2, :string, "Password:", :bool, false, :string, "Again:", :bool, false)
-        t.expect do |t,packet|
-          assert_equal USERAUTH_INFO_RESPONSE, packet.type
-          assert_equal 2, packet.read_long
-          assert_equal "the-password", packet.read_string
-          assert_equal "the-password", packet.read_string
-          t.return(USERAUTH_SUCCESS)
+        t.expect do |t2,packet2|
+          assert_equal USERAUTH_INFO_RESPONSE, packet2.type
+          assert_equal 2, packet2.read_long
+          assert_equal "the-password", packet2.read_string
+          assert_equal "the-password", packet2.read_string
+          t2.return(USERAUTH_SUCCESS)
         end
       end
 
@@ -76,12 +76,12 @@ module Authentication; module Methods
       transport.expect do |t,packet|
         assert_equal USERAUTH_REQUEST, packet.type
         t.return(USERAUTH_INFO_REQUEST, :string, "", :string, "", :string, "", :long, 2, :string, "Name:", :bool, true, :string, "Password:", :bool, false)
-        t.expect do |t,packet|
-          assert_equal USERAUTH_INFO_RESPONSE, packet.type
-          assert_equal 2, packet.read_long
-          assert_equal "name", packet.read_string
-          assert_equal "password", packet.read_string
-          t.return(USERAUTH_SUCCESS)
+        t.expect do |t2,packet2|
+          assert_equal USERAUTH_INFO_RESPONSE, packet2.type
+          assert_equal 2, packet2.read_long
+          assert_equal "name", packet2.read_string
+          assert_equal "password", packet2.read_string
+          t2.return(USERAUTH_SUCCESS)
         end
       end
 

data/test/authentication/methods/test_publickey.rb

@@ -21,10 +21,10 @@ module Authentication; module Methods
         assert verify_userauth_request_packet(packet, keys.first, false)
         t.return(USERAUTH_FAILURE, :string, "hostbased,password")
 
-        t.expect do |t, packet|
-          assert_equal USERAUTH_REQUEST, packet.type
-          assert verify_userauth_request_packet(packet, keys.last, false)
-          t.return(USERAUTH_FAILURE, :string, "hostbased,password")
+        t.expect do |t2, packet2|
+          assert_equal USERAUTH_REQUEST, packet2.type
+          assert verify_userauth_request_packet(packet2, keys.last, false)
+          t2.return(USERAUTH_FAILURE, :string, "hostbased,password")
         end
       end
 
@@ -40,22 +40,22 @@ module Authentication; module Methods
         assert verify_userauth_request_packet(packet, keys.first, false)
         t.return(USERAUTH_PK_OK, :string, keys.first.ssh_type, :string, Net::SSH::Buffer.from(:key, keys.first))
 
-        t.expect do |t,packet|
-          assert_equal USERAUTH_REQUEST, packet.type
-          assert verify_userauth_request_packet(packet, keys.first, true)
-          assert_equal "sig-one", packet.read_string
-          t.return(USERAUTH_FAILURE, :string, "hostbased,password")
-
-          t.expect do |t, packet|
-            assert_equal USERAUTH_REQUEST, packet.type
-            assert verify_userauth_request_packet(packet, keys.last, false)
-            t.return(USERAUTH_PK_OK, :string, keys.last.ssh_type, :string, Net::SSH::Buffer.from(:key, keys.last))
-
-            t.expect do |t,packet|
-              assert_equal USERAUTH_REQUEST, packet.type
-              assert verify_userauth_request_packet(packet, keys.last, true)
-              assert_equal "sig-two", packet.read_string
-              t.return(USERAUTH_FAILURE, :string, "hostbased,password")
+        t.expect do |t2,packet2|
+          assert_equal USERAUTH_REQUEST, packet2.type
+          assert verify_userauth_request_packet(packet2, keys.first, true)
+          assert_equal "sig-one", packet2.read_string
+          t2.return(USERAUTH_FAILURE, :string, "hostbased,password")
+
+          t2.expect do |t3, packet3|
+            assert_equal USERAUTH_REQUEST, packet3.type
+            assert verify_userauth_request_packet(packet3, keys.last, false)
+            t3.return(USERAUTH_PK_OK, :string, keys.last.ssh_type, :string, Net::SSH::Buffer.from(:key, keys.last))
+
+            t3.expect do |t4,packet4|
+              assert_equal USERAUTH_REQUEST, packet4.type
+              assert verify_userauth_request_packet(packet4, keys.last, true)
+              assert_equal "sig-two", packet4.read_string
+              t4.return(USERAUTH_FAILURE, :string, "hostbased,password")
             end
           end
         end
@@ -72,11 +72,11 @@ module Authentication; module Methods
         assert verify_userauth_request_packet(packet, keys.first, false)
         t.return(USERAUTH_PK_OK, :string, keys.first.ssh_type, :string, Net::SSH::Buffer.from(:key, keys.first))
 
-        t.expect do |t,packet|
-          assert_equal USERAUTH_REQUEST, packet.type
-          assert verify_userauth_request_packet(packet, keys.first, true)
-          assert_equal "sig-one", packet.read_string
-          t.return(USERAUTH_SUCCESS)
+        t.expect do |t2,packet2|
+          assert_equal USERAUTH_REQUEST, packet2.type
+          assert verify_userauth_request_packet(packet2, keys.first, true)
+          assert_equal "sig-one", packet2.read_string
+          t2.return(USERAUTH_SUCCESS)
         end
       end
 

data/test/connection/test_channel.rb

@@ -127,10 +127,10 @@ module Connection
         assert_equal 0, packet[:local_id]
         assert_equal "hello wo", packet[:data]
         
-        t.expect do |t,packet|
-          assert_equal CHANNEL_DATA, packet.type
-          assert_equal 0, packet[:local_id]
-          assert_equal "rld", packet[:data]
+        t.expect do |t2,packet2|
+          assert_equal CHANNEL_DATA, packet2.type
+          assert_equal 0, packet2[:local_id]
+          assert_equal "rld", packet2[:data]
         end
       end
 

data/test/connection/test_session.rb

@@ -420,27 +420,27 @@ module Connection
         transport.expect do |t, p|
           assert_equal CHANNEL_OPEN, p.type
           t.return(CHANNEL_OPEN_CONFIRMATION, :long, p[:remote_id], :long, 0, :long, 0x20000, :long, 0x10000)
-          t.expect do |t, p2|
+          t.expect do |t2, p2|
             assert_equal CHANNEL_REQUEST, p2.type
             assert_equal "exec", p2[:request]
             assert_equal true, p2[:want_reply]
             assert_equal "ls", p2.read_string
 
-            t.return(CHANNEL_SUCCESS, :long, p[:remote_id])
+            t2.return(CHANNEL_SUCCESS, :long, p[:remote_id])
 
             0.step(data.length-1, 2) do |index|
               type = data[index]
               datum = data[index+1]
 
               if type == :stdout
-                t.return(CHANNEL_DATA, :long, p[:remote_id], :string, datum)
+                t2.return(CHANNEL_DATA, :long, p[:remote_id], :string, datum)
               else
-                t.return(CHANNEL_EXTENDED_DATA, :long, p[:remote_id], :long, 1, :string, datum)
+                t2.return(CHANNEL_EXTENDED_DATA, :long, p[:remote_id], :long, 1, :string, datum)
               end
             end
 
-            t.return(CHANNEL_CLOSE, :long, p[:remote_id])
-            t.expect { |t,p| assert_equal CHANNEL_CLOSE, p.type }
+            t2.return(CHANNEL_CLOSE, :long, p[:remote_id])
+            t2.expect { |t3,p3| assert_equal CHANNEL_CLOSE, p3.type }
           end
         end
       end

data/test/transport/kex/test_diffie_hellman_group1_sha1.rb

@@ -66,9 +66,9 @@ module Transport; module Kex
           assert_equal KEXDH_INIT, buffer.type
           assert_equal dh.dh.pub_key, buffer.read_bignum
           t.return(KEXDH_REPLY, :string, b(:key, server_key), :bignum, server_dh_pubkey, :string, b(:string, options[:key_type] || "ssh-rsa", :string, signature))
-          connection.expect do |t, buffer|
-            assert_equal NEWKEYS, buffer.type
-            t.return(NEWKEYS)
+          connection.expect do |t2, buffer2|
+            assert_equal NEWKEYS, buffer2.type
+            t2.return(NEWKEYS)
           end
         end
 

data/test/transport/kex/test_diffie_hellman_group_exchange_sha1.rb

@@ -51,13 +51,13 @@ module Transport; module Kex
           assert_equal need_bits, buffer.read_long
           assert_equal 8192, buffer.read_long
           t.return(KEXDH_GEX_GROUP, :bignum, bn(options[:p] || default_p), :bignum, bn(options[:g] || 2))
-          t.expect do |t, buffer|
-            assert_equal KEXDH_GEX_INIT, buffer.type
-            assert_equal dh.dh.pub_key, buffer.read_bignum
-            t.return(KEXDH_GEX_REPLY, :string, b(:key, server_key), :bignum, server_dh_pubkey, :string, b(:string, options[:key_type] || "ssh-rsa", :string, signature))
-            t.expect do |t, buffer|
-              assert_equal NEWKEYS, buffer.type
-              t.return(NEWKEYS)
+          t.expect do |t2, buffer2|
+            assert_equal KEXDH_GEX_INIT, buffer2.type
+            assert_equal dh.dh.pub_key, buffer2.read_bignum
+            t2.return(KEXDH_GEX_REPLY, :string, b(:key, server_key), :bignum, server_dh_pubkey, :string, b(:string, options[:key_type] || "ssh-rsa", :string, signature))
+            t2.expect do |t3, buffer3|
+              assert_equal NEWKEYS, buffer3.type
+              t3.return(NEWKEYS)
             end
           end
         end

data/test/transport/test_cipher_factory.rb

@@ -4,6 +4,10 @@ require 'net/ssh/transport/cipher_factory'
 module Transport
 
   class TestCipherFactory < Test::Unit::TestCase
+    def self.if_supported?(name)
+      yield if Net::SSH::Transport::CipherFactory.supported?(name)
+    end
+
     def test_lengths_for_none
       assert_equal [0,0], factory.get_lengths("none")
       assert_equal [0,0], factory.get_lengths("bogus")
@@ -13,8 +17,10 @@ module Transport
       assert_equal [16,8], factory.get_lengths("blowfish-cbc")
     end
 
-    def test_lengths_for_idea_cbc
-      assert_equal [16,8], factory.get_lengths("idea-cbc")
+    if_supported?("idea-cbc") do
+      def test_lengths_for_idea_cbc
+        assert_equal [16,8], factory.get_lengths("idea-cbc")
+      end
     end
 
     def test_lengths_for_rijndael_cbc
@@ -51,14 +57,16 @@ module Transport
       assert_equal TEXT, decrypt("blowfish-cbc", BLOWFISH)
     end
 
-    IDEA = "W\234\017G\231\b\357\370H\b\256U]\343M\031k\233]~\023C\363\263\177\262-\261\341$\022\376mv\217\322\b\2763\270H\306\035\343z\313\312\3531\351\t\201\302U\022\360\300\354ul7$z\320O]\360g\024\305\005`V\005\335A\351\312\270c\320D\232\eQH1\340\265\2118\031g*\303v"
+    if_supported?("idea-cbc") do
+      IDEA = "W\234\017G\231\b\357\370H\b\256U]\343M\031k\233]~\023C\363\263\177\262-\261\341$\022\376mv\217\322\b\2763\270H\306\035\343z\313\312\3531\351\t\201\302U\022\360\300\354ul7$z\320O]\360g\024\305\005`V\005\335A\351\312\270c\320D\232\eQH1\340\265\2118\031g*\303v"
 
-    def test_idea_cbc_for_encryption
-      assert_equal IDEA, encrypt("idea-cbc")
-    end
+      def test_idea_cbc_for_encryption
+        assert_equal IDEA, encrypt("idea-cbc")
+      end
 
-    def test_idea_cbc_for_decryption
-      assert_equal TEXT, decrypt("idea-cbc", IDEA)
+      def test_idea_cbc_for_decryption
+        assert_equal TEXT, decrypt("idea-cbc", IDEA)
+      end
     end
 
     RIJNDAEL = "$\253\271\255\005Z\354\336&\312\324\221\233\307Mj\315\360\310Fk\241EfN\037\231\213\361{'\310\204\347I\343\271\005\240`\325;\034\346uM>#\241\231C`\374\261\vo\226;Z\302:\b\250\366T\330\\#V\330\340\226\363\374!\bm\266\232\207!\232\347\340\t\307\370\356z\236\343=v\210\206y"

data/test/transport/test_packet_stream.rb

@@ -370,6 +370,8 @@ module Transport
     hmacs = Net::SSH::Transport::HMAC::MAP.keys
 
     ciphers.each do |cipher_name|
+      next unless Net::SSH::Transport::CipherFactory.supported?(cipher_name)
+
       hmacs.each do |hmac_name|
         [false, :standard].each do |compress|
           cipher_method_name = cipher_name.gsub(/\W/, "_")

data/test/transport/test_session.rb

@@ -4,7 +4,10 @@ require 'net/ssh/transport/session'
 # mocha adds #verify to Object, which throws off the host-key-verifier part of
 # these tests.
 
-Object.send(:undef_method, :verify)
+# can't use .include? because ruby18 uses strings and ruby19 uses symbols :/
+if Object.instance_methods.any? { |v| v.to_sym == :verify }
+  Object.send(:undef_method, :verify)
+end
 
 module Transport
 

data/test/transport/test_state.rb

@@ -166,7 +166,7 @@ module Transport
       end
 
       def state
-        @state ||= Net::SSH::Transport::State.new(socket)
+        @state ||= Net::SSH::Transport::State.new(socket, :test)
       end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-ssh
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors: 
 - Jamis Buck
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-27 00:00:00 -06:00
+date: 2008-12-06 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: echoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: a pure-Ruby implementation of the SSH2 client protocol
 email: jamis@jamisbuck.org
 executables: []
@@ -209,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.2"
   version: 
 requirements: []