net-ssh 2.0.1 → 2.0.2

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+=== 2.0.2 / 29 May 2008
+
+* Make sure the agent client understands both RSA "identities answers" [Jamis Buck]
+
+* Fixed key truncation bug that caused hmacs other than SHA1 to fail with "corrupt hmac" errors [Jamis Buck]
+
+* Fix detection and loading of public keys when the keys don't actually exist [David Dollar]
+
+
 === 2.0.1 / 5 May 2008
 
 * Teach Net::SSH about a handful of default key names [Jamis Buck]

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

@@ -39,7 +39,8 @@ module Net; module SSH; module Authentication
     SSH_COM_AGENT2_FAILURE        = 102
 
     SSH_AGENT_REQUEST_RSA_IDENTITIES = 1
-    SSH_AGENT_RSA_IDENTITIES_ANSWER  = 2
+    SSH_AGENT_RSA_IDENTITIES_ANSWER1 = 2
+    SSH_AGENT_RSA_IDENTITIES_ANSWER2 = 5
     SSH_AGENT_FAILURE                = 5
 
     # The underlying socket being used to communicate with the SSH agent.
@@ -82,7 +83,7 @@ module Net; module SSH; module Authentication
 
       if type == SSH2_AGENT_VERSION_RESPONSE
         raise NotImplementedError, "SSH2 agents are not yet supported"
-      elsif type != SSH_AGENT_RSA_IDENTITIES_ANSWER
+      elsif type != SSH_AGENT_RSA_IDENTITIES_ANSWER1 && type != SSH_AGENT_RSA_IDENTITIES_ANSWER2
         raise AgentError, "unknown response from agent: #{type}, #{body.to_s.inspect}"
       end
     end

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

@@ -89,9 +89,10 @@ module Net
           end
 
           key_files.each do |file|
-            if File.readable?(file)
+            public_key_file = file + '.pub'
+            if File.readable?(public_key_file)
               begin
-                key = KeyFactory.load_public_key(file + ".pub")
+                key = KeyFactory.load_public_key(public_key_file)
                 identities.push key
                 known_identities[key] = { :from => :file, :file => file }
               rescue Exception => e

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

@@ -31,13 +31,19 @@ module Net; module SSH; module Transport; module HMAC
       define_method(attribute) { self.class.send(attribute) }
     end
 
-    # The key to use for this instance.
-    attr_accessor :key
+    # The key in use for this instance.
+    attr_reader :key
 
     def initialize(key=nil)
       self.key = key
     end
 
+    # Sets the key to the given value, truncating it so that it is the correct
+    # length.
+    def key=(value)
+      @key = value ? value.to_s[0,key_length] : nil
+    end
+
     # Compute the HMAC digest for the given data string.
     def digest(data)
       OpenSSL::HMAC.digest(digest_class.new, key, data)[0,mac_length]

data/lib/net/ssh/version.rb

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

data/net-ssh.gemspec

@@ -1,21 +1,23 @@
 
-# Gem::Specification for Net-ssh-2.0.1
+# Gem::Specification for Net-ssh-2.0.2
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{net-ssh}
-  s.version = "2.0.1"
+  s.version = "2.0.2"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck"]
-  s.date = %q{2008-05-05}
+  s.date = %q{2008-05-29}
   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"]
   s.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", "Rakefile", "README.rdoc", "setup.rb", "test/authentication/methods/common.rb", "test/authentication/methods/test_abstract.rb", "test/authentication/methods/test_hostbased.rb", "test/authentication/methods/test_keyboard_interactive.rb", "test/authentication/methods/test_password.rb", "test/authentication/methods/test_publickey.rb", "test/authentication/test_agent.rb", "test/authentication/test_key_manager.rb", "test/authentication/test_session.rb", "test/common.rb", "test/configs/exact_match", "test/configs/wild_cards", "test/connection/test_channel.rb", "test/connection/test_session.rb", "test/test_all.rb", "test/test_buffer.rb", "test/test_buffered_io.rb", "test/test_config.rb", "test/test_key_factory.rb", "test/transport/hmac/test_md5.rb", "test/transport/hmac/test_md5_96.rb", "test/transport/hmac/test_none.rb", "test/transport/hmac/test_sha1.rb", "test/transport/hmac/test_sha1_96.rb", "test/transport/kex/test_diffie_hellman_group1_sha1.rb", "test/transport/kex/test_diffie_hellman_group_exchange_sha1.rb", "test/transport/test_algorithms.rb", "test/transport/test_cipher_factory.rb", "test/transport/test_hmac.rb", "test/transport/test_identity_cipher.rb", "test/transport/test_packet_stream.rb", "test/transport/test_server_version.rb", "test/transport/test_session.rb", "test/transport/test_state.rb", "THANKS.rdoc", "Manifest", "net-ssh.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://net-ssh.rubyforge.org/ssh}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Net-ssh", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{net-ssh}
   s.rubygems_version = %q{1.1.1}

data/test/common.rb

@@ -103,4 +103,4 @@ class MockTransport < Net::SSH::Transport::Session
   def hint(name, value=true)
     @hints[name] = value
   end
-end
+end

data/test/transport/hmac/test_md5.rb

@@ -24,6 +24,11 @@ module Transport; module HMAC
       assert_equal "\275\345\006\307y~Oi\035<.\341\031\250<\257", hmac.digest("hello world")
     end
 
+    def test_key_should_be_truncated_to_required_length
+      hmac = subject.new("12345678901234567890")
+      assert_equal "1234567890123456", hmac.key
+    end
+
     private
 
       def subject

data/test/transport/test_hmac.rb

@@ -7,7 +7,7 @@ module Transport
     Net::SSH::Transport::HMAC::MAP.each do |name, value|
       method = name.tr("-", "_")
       define_method("test_get_with_#{method}_returns_new_hmac_instance") do
-        key = "abcdefghijklmnopqrstuvwxyz"[0..Net::SSH::Transport::HMAC::MAP[name].key_length]
+        key = "abcdefghijklmnopqrstuvwxyz"[0,Net::SSH::Transport::HMAC::MAP[name].key_length]
         hmac = Net::SSH::Transport::HMAC.get(name, key)
         assert_instance_of Net::SSH::Transport::HMAC::MAP[name], hmac
         assert_equal key, hmac.key

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-ssh
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Jamis Buck
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-05 00:00:00 -06:00
+date: 2008-05-29 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -19,8 +19,71 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+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
 files: 
 - CHANGELOG.rdoc
 - lib/net/ssh/authentication/agent.rb
@@ -127,8 +190,13 @@ files:
 has_rdoc: true
 homepage: http://net-ssh.rubyforge.org/ssh
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Net-ssh
+- --main
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement