net-ssh 2.6.2 → 2.6.3

data/CHANGELOG.rdoc

@@ -1,4 +1,23 @@
 
+=== 2.6.3 / 10 Jan 2013
+
+* Small doc fix and correct error class for PKey::EC key type [Andreas Wolff]
+* Improve test dependencies [Kenichi Kamiya]
+
+
+=== 2.6.2 / 22 Nov 2012
+
+* Net::SSH.start now returns result of block [mhuffnagle]
+* Add stderr handling to Net::SSH::Test [ohrite]
+* Fix Invalid key size in JRuby [ohrite]
+
+
+=== 2.6.1 / 18 Oct 2012
+
+* Remove platform specific jruby dependency from gemspec
+* Changed encoding of file to prevent warnings when generating docs [iltempo]
+
+
 === 2.6.0 / 19 Sep 2012
 
 * Use OpenSSL::PKey.read to read arbitrary private key. [nagachika]
@@ -10,7 +29,7 @@
 
 === 2.5.2 / 25 May 2012
 
-* Fix for Net::SSH::KnownHosts::SUPPORTED_TYPE [Marco Sandrini] 
+* Fix for Net::SSH::KnownHosts::SUPPORTED_TYPE [Marco Sandrini]
 
 === 2.5.1 / 24 May 2012
 

data/lib/net/ssh/authentication/methods/keyboard_interactive.rb

@@ -42,7 +42,7 @@ module Net
                   puts(instruction) unless instruction.empty?
                 end
 
-                lang_tag = message.read_string
+                _ = message.read_string # lang_tag
                 responses =[]
   
                 message.read_long.times do

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

@@ -54,7 +54,7 @@ module Net; module SSH; module Authentication
       debug { "beginning authentication of `#{username}'" }
 
       transport.send_message(transport.service_request("ssh-userauth"))
-      message = expect_message(SERVICE_ACCEPT)
+      expect_message(SERVICE_ACCEPT)
 
       key_manager = KeyManager.new(logger, options)
       keys.each { |key| key_manager.add(key) } unless keys.empty?
@@ -70,7 +70,7 @@ module Net; module SSH; module Authentication
           debug { "trying #{name}" }
           begin 
             method = Methods.const_get(name.split(/\W+/).map { |p| p.capitalize }.join).new(self, :key_manager => key_manager)
-          rescue NameError => ne
+          rescue NameError
             debug{"Mechanism #{name} was requested, but isn't a known type.  Ignoring it."}
             next
           end

data/lib/net/ssh/buffer.rb

@@ -261,7 +261,7 @@ module Net; module SSH
           else
             begin
               key = OpenSSL::PKey::EC.read_keyblob($1, self)
-            rescue OpenSSL::PKey::ECError => e
+            rescue OpenSSL::PKey::ECError
               raise NotImplementedError, "unsupported key type `#{type}'"
             end
           end

data/lib/net/ssh/key_factory.rb

@@ -61,7 +61,7 @@ module Net; module SSH
             error_class = OpenSSL::PKey::RSAError
           elsif data.match(/-----BEGIN EC PRIVATE KEY-----/) && defined?(OpenSSL::PKey::EC)
             key_type = OpenSSL::PKey::EC
-            error_class = OpenSSL::PKey::RCError
+            error_class = OpenSSL::PKey::ECError
           elsif data.match(/-----BEGIN (.+) PRIVATE KEY-----/)
             raise OpenSSL::PKey::PKeyError, "not a supported key type '#{$1}'"
           else
@@ -105,7 +105,7 @@ module Net; module SSH
       # the file describes an RSA or DSA key, and will load it
       # appropriately. The new public key is returned.
       def load_data_public_key(data, filename="")
-        type, blob = data.split(/ /)
+        _, blob = data.split(/ /)
 
         raise Net::SSH::Exception, "public key at #{filename} is not valid" if blob.nil?
 

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

@@ -177,7 +177,7 @@ module Net; module SSH; module Service
     # time a session channel is opened, when the connection was created with
     # :forward_agent set to true:
     #
-    #    Net::SSH.start("remote.host", "me", :forwrd_agent => true) do |ssh|
+    #    Net::SSH.start("remote.host", "me", :forward_agent => true) do |ssh|
     #      ssh.open_channel do |ch|
     #        # agent will be automatically forwarded by this point
     #      end

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

@@ -263,7 +263,7 @@ module Net; module SSH; module Transport
         # TODO: if first_kex_packet_follows, we need to try to skip the
         # actual kexinit stuff and try to guess what the server is doing...
         # need to read more about this scenario.
-        first_kex_packet_follows = packet.read_bool
+        # first_kex_packet_follows = packet.read_bool
 
         return data
       end

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

@@ -22,5 +22,5 @@ module Net; module SSH; module Transport
 
     return k
   end
-end
+  end
 end; end; end

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

@@ -153,7 +153,7 @@ module OpenSSL
             key.public_key = point
 
             return key
-          rescue OpenSSL::PKey::ECError => e
+          rescue OpenSSL::PKey::ECError
             raise NotImplementedError, "unsupported key type `#{type}'"
           end
 

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

@@ -82,7 +82,11 @@ module Net; module SSH; module Transport
     def next_packet(mode=:nonblock)
       case mode
       when :nonblock then
-        fill if available_for_read?
+        if available_for_read?
+          if fill <= 0
+            raise Net::SSH::Disconnect, "connection closed by remote host"
+          end
+        end
         poll_next_packet
 
       when :block then
@@ -215,7 +219,6 @@ module Net; module SSH; module Transport
         padding_length = @packet.read_byte
 
         payload = @packet.read(@packet_length - padding_length - 1)
-        padding = @packet.read(padding_length) if padding_length > 0
 
         my_computed_hmac = server.hmac.digest([server.sequence_number, @packet.content].pack("NA*"))
         raise Net::SSH::Exception, "corrupted mac detected" if real_hmac != my_computed_hmac

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

@@ -46,7 +46,7 @@ module Net; module SSH; module Transport
             begin
               b = socket.readpartial(1)
               raise Net::SSH::Disconnect, "connection closed by remote host" if b.nil?
-            rescue EOFError => e
+            rescue EOFError
               raise Net::SSH::Disconnect, "connection closed by remote host"
             end
             @version << b

data/lib/net/ssh/version.rb

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

data/net-ssh.gemspec

@@ -1,27 +1,30 @@
 @spec = Gem::Specification.new do |s|
   s.name = "net-ssh"
   s.rubyforge_project = 'net-ssh'
-  s.version = "2.6.2"
+  s.version = "2.6.3"
   s.summary = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."
   s.description = s.summary + " It allows you to write programs that invoke and interact with processes on remote servers, via SSH2."
   s.authors = ["Jamis Buck", "Delano Mandelbaum"]
   s.email = ["net-ssh@solutious.com"]
   s.homepage = "http://github.com/net-ssh/net-ssh"
-  
+
   s.extra_rdoc_files = %w[README.rdoc THANKS.rdoc CHANGELOG.rdoc]
   s.has_rdoc = true
   s.rdoc_options = ["--line-numbers", "--title", s.summary, "--main", "README.rdoc"]
   s.require_paths = %w[lib]
   s.rubygems_version = '1.3.2'
-  
+
   # Note: this is run at package time not install time so if you are
   # running on jruby, you need to install jruby-pageant manually.
   if RUBY_PLATFORM == "java"
     s.add_dependency 'jruby-pageant', ">=1.1.1"
   end
-  
+
+  s.add_development_dependency 'test-unit'
+  s.add_development_dependency 'mocha'
+
   s.executables = %w[]
-  
+
   # = MANIFEST =
   s.files = %w(
   CHANGELOG.rdoc

data/test/common.rb

@@ -1,7 +1,8 @@
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 gem "test-unit" # http://rubyforge.org/pipermail/test-unit-tracker/2009-July/000075.html
+gem 'mocha'
 require 'test/unit'
-require 'mocha'
+require 'mocha/setup'
 require 'net/ssh/buffer'
 require 'net/ssh/config'
 require 'net/ssh/loggable'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,8 +10,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
-dependencies: []
+date: 2013-01-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &70335346122740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70335346122740
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70335346119640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70335346119640
 description: ! 'Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.
   It allows you to write programs that invoke and interact with processes on remote
   servers, via SSH2.'