net-ssh 2.9.2 → 4.0.0

data/support/ssh_tunnel_bug.rb

@@ -37,7 +37,7 @@ pass = ask("Password: ") { |q| q.echo = "*" }
 puts "Configure your browser proxy to localhost:#{LOCAL_PORT}"
 
 begin
-  session = Net::SSH.start(host, user, :password => pass)  
+  session = Net::SSH.start(host, user, password: pass)  
   session.forward.local(LOCAL_PORT, host, PROXY_PORT)
   session.loop{true}
 rescue => e

metadata

@@ -1,89 +1,168 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Jamis Buck
 - Delano Mandelbaum
 - Miklós Fazekas
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDODCCAiCgAwIBAgIBADANBgkqhkiG9w0BAQUFADBCMRAwDgYDVQQDDAduZXQt
-  c3NoMRkwFwYKCZImiZPyLGQBGRYJc29sdXRpb3VzMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMB4XDTE0MTIwMjE3MzkyMFoXDTE1MTIwMjE3MzkyMFowQjEQMA4GA1UEAwwH
-  bmV0LXNzaDEZMBcGCgmSJomT8ixkARkWCXNvbHV0aW91czETMBEGCgmSJomT8ixk
-  ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ0qnw4JV5JN
-  MWelqu7pnW2z6GZJ7+zLFYJQNETJyF0U5zo7aCRK08OeUxnpu/TCCXK8iQVkNLfz
-  9pVIhF+X8pMEIruAkYGwBt1aWfuSNeyodyMk0vpZdxBHbOTJ4qBRUc6qOtNOeOzv
-  8ObYUX52P/EMMaeXTRU+e7MGkB9pb6FvPPNx5akxwIaoRvtcMsc/hJnQuP5r96w6
-  t06MgKbXhWAX6gev0RVlrQqzxXst6iuvsrgZGjFqzob5wbTiX9M0+bFAB0EI7tJC
-  sv5keEbtNRaU7p3ZbMm4wTHHJLOtD+BpUCSzwv4ToNj9mZtJBMYw2Eeo7z1DklEG
-  mr95zbe+zNMCAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4EFgQU1bTfpzmitXwv
-  LmTXi0IO5vd8NGYwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEBBQUAA4IBAQA0Aps8
-  UPINGa8XUUtrZtzrgX0/iyXNkKY1ld85g1N3WKEAVLfQI7TlGr0Qv2Ekx6RqlxbR
-  Vyq08pytSnghW2otR3bIGMGQzqxAeRLb25cjEwH7YIJ32n7ZC1fpMnBZOBDmueWA
-  B9EonmoO3ne7AJSgIvBbZzBPhzM4HrQGRW8LsPFsuj+dcJI43HOQwkmv2TRz0+t6
-  mGZldmqLcK0abv4JepLfB9XTue3kuyA29NGBibqyvRwlKckLpvKfHZX6Jxad8xxm
-  MbvRpzgROzyfw1qYi4dnIyMwTtXFFcZ0a2jpxHPkcTYFK6TzvFgDLAP0Y/u9jqUQ
-  eZ7/3CdSi/isZHEw
+  MIIDeDCCAmCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBBMQ8wDQYDVQQDDAZuZXRz
+  c2gxGTAXBgoJkiaJk/IsZAEZFglzb2x1dGlvdXMxEzARBgoJkiaJk/IsZAEZFgNj
+  b20wHhcNMTYxMjE1MTgwNTIyWhcNMTcxMjE1MTgwNTIyWjBBMQ8wDQYDVQQDDAZu
+  ZXRzc2gxGTAXBgoJkiaJk/IsZAEZFglzb2x1dGlvdXMxEzARBgoJkiaJk/IsZAEZ
+  FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGJ4TbZ9H+qZ08
+  pQfJhPJTHaDCyQvCsKTFrL5O9z3tllQ7B/zksMMM+qFBpNYu9HCcg4yBATacE/PB
+  qVVyUrpr6lbH/XwoN5ljXm+bdCfmnjZvTCL2FTE6o+bcnaF0IsJyC0Q2B1fbWdXN
+  6Off1ZWoUk6We2BIM1bn6QJLxBpGyYhvOPXsYoqSuzDf2SJDDsWFZ8kV5ON13Ohm
+  JbBzn0oD8HF8FuYOewwsC0C1q4w7E5GtvHcQ5juweS7+RKsyDcVcVrLuNzoGRttS
+  KP4yMn+TzaXijyjRg7gECfJr3TGASaA4bQsILFGG5dAWcwO4OMrZedR7SHj/o0Kf
+  3gL7P0axAgMBAAGjezB5MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBQF8qLA7Z4zg0SJGtUbv3eoQ8tjIzAfBgNVHREEGDAWgRRuZXRzc2hAc29sdXRp
+  b3VzLmNvbTAfBgNVHRIEGDAWgRRuZXRzc2hAc29sdXRpb3VzLmNvbTANBgkqhkiG
+  9w0BAQUFAAOCAQEATd8If+Ytmhf5lELy24j76ahGv64m518WTCdV2nIViGXB2BnV
+  uLQylGRb1rcgUS3Eh9TE28hqrfhotKS6a96qF9kN0mY2H6UwPWswJ+tj3gA1vLW8
+  wlZNlYGJ91Ig9zULPSbATyOOprUZyggy5p1260BaaI3LQYDeGJOSqpHCVu+TuMcy
+  k00ofiLT1crDSUl2WE/OIFK8AXpmd798AMsef8okHeoo+Dj7zCXn0VSimN+MO1mE
+  L4d54WIy4HkZCqQXoTSiK5HZMIdXkPk3F1bZdJ8Dy1sMRru0rUkkM5mW7TQ75mfW
+  Zp0QrZyNZhtitrXFbZneGRrIA/8G2Krft5Ly/A==
   -----END CERTIFICATE-----
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.10
+  name: rbnacl-libsodium
+  prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.10
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+  name: rbnacl
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+  name: bundler
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  name: rake
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
+  name: minitest
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
 - !ruby/object:Gem::Dependency
-  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.46.0
+  name: rubocop
+  prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.46.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  name: mocha
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.1
 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.'
-email: net-ssh@solutious.com
+email:
+- net-ssh@solutious.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGES.txt
+- Gemfile
+- Gemfile.norbnacl
+- Gemfile.norbnacl.lock
+- ISSUE_TEMPLATE.md
 - LICENSE.txt
 - Manifest
 - README.rdoc
 - Rakefile
-- Rudyfile
 - THANKS.txt
+- appveyor.yml
 - lib/net/ssh.rb
 - lib/net/ssh/authentication/agent.rb
-- lib/net/ssh/authentication/agent/java_pageant.rb
-- lib/net/ssh/authentication/agent/socket.rb
 - lib/net/ssh/authentication/constants.rb
+- lib/net/ssh/authentication/ed25519.rb
+- lib/net/ssh/authentication/ed25519_loader.rb
 - lib/net/ssh/authentication/key_manager.rb
 - lib/net/ssh/authentication/methods/abstract.rb
 - lib/net/ssh/authentication/methods/hostbased.rb
@@ -98,6 +177,7 @@ files:
 - lib/net/ssh/config.rb
 - lib/net/ssh/connection/channel.rb
 - lib/net/ssh/connection/constants.rb
+- lib/net/ssh/connection/event_loop.rb
 - lib/net/ssh/connection/keepalive.rb
 - lib/net/ssh/connection/session.rb
 - lib/net/ssh/connection/term.rb
@@ -110,6 +190,7 @@ files:
 - lib/net/ssh/proxy/command.rb
 - lib/net/ssh/proxy/errors.rb
 - lib/net/ssh/proxy/http.rb
+- lib/net/ssh/proxy/https.rb
 - lib/net/ssh/proxy/socks4.rb
 - lib/net/ssh/proxy/socks5.rb
 - lib/net/ssh/ruby_compat.rb
@@ -161,95 +242,30 @@ files:
 - lib/net/ssh/version.rb
 - net-ssh-public_cert.pem
 - net-ssh.gemspec
-- setup.rb
 - support/arcfour_check.rb
 - support/ssh_tunnel_bug.rb
-- test/README.txt
-- 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_none.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/auth_off
-- test/configs/auth_on
-- test/configs/empty
-- test/configs/eqsign
-- test/configs/exact_match
-- test/configs/host_plus
-- test/configs/multihost
-- test/configs/negative_match
-- test/configs/nohost
-- test/configs/numeric_host
-- test/configs/send_env
-- test/configs/substitutes
-- test/configs/wild_cards
-- test/connection/test_channel.rb
-- test/connection/test_session.rb
-- test/known_hosts/github
-- test/manual/test_forward.rb
-- test/manual/test_pageant.rb
-- test/start/test_connection.rb
-- test/start/test_options.rb
-- test/start/test_transport.rb
-- test/test_all.rb
-- test/test_buffer.rb
-- test/test_buffered_io.rb
-- test/test_config.rb
-- test/test_key_factory.rb
-- test/test_known_hosts.rb
-- test/transport/hmac/test_md5.rb
-- test/transport/hmac/test_md5_96.rb
-- test/transport/hmac/test_none.rb
-- test/transport/hmac/test_ripemd160.rb
-- test/transport/hmac/test_sha1.rb
-- test/transport/hmac/test_sha1_96.rb
-- test/transport/hmac/test_sha2_256.rb
-- test/transport/hmac/test_sha2_256_96.rb
-- test/transport/hmac/test_sha2_512.rb
-- test/transport/hmac/test_sha2_512_96.rb
-- test/transport/kex/test_diffie_hellman_group14_sha1.rb
-- test/transport/kex/test_diffie_hellman_group1_sha1.rb
-- test/transport/kex/test_diffie_hellman_group_exchange_sha1.rb
-- test/transport/kex/test_diffie_hellman_group_exchange_sha256.rb
-- test/transport/kex/test_ecdh_sha2_nistp256.rb
-- test/transport/kex/test_ecdh_sha2_nistp384.rb
-- test/transport/kex/test_ecdh_sha2_nistp521.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
 homepage: https://github.com/net-ssh/net-ssh
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: net-ssh
-rubygems_version: 2.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.8
+signing_key:
 specification_version: 4
 summary: 'Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'
 test_files: []

data/Rudyfile

@@ -1,96 +0,0 @@
-# Rudyfile
-#
-# This configuration is used to test installing
-# and running net-ssh on a clean machine. 
-#
-# Usage:
-#
-#     $ rudy -vv startup
-#     $ rudy -vv testsuite
-#     $ rudy -vv shutdown
-#
-# Requires: Rudy 0.9 (http://code.google.com/p/rudy/)
-#
-
-defaults do
-  color true
-  environment :test
-  role :netssh
-end
-
-machines do
-  region :'us-east-1' do
-    ami 'ami-e348af8a'               # Alestic Debian 5.0, 32-bit (US)
-  end
-  env :test do
-    role :netssh do
-      user :root
-    end
-  end
-end
-
-commands do
-  allow :apt_get, "apt-get", :y, :q
-  allow :gem_install, "/usr/bin/gem", "install", :n, '/usr/bin', :y, :V, "--no-rdoc", "--no-ri"
-  allow :gem_sources, "/usr/bin/gem", "sources"
-  allow :gem_uninstall, "/usr/bin/gem", "uninstall", :V
-  allow :update_rubygems
-  allow :rm
-end
-
-routines do
-  
-  testsuite do
-    before :sysupdate, :installdeps, :install_gem
-    
-    remote :root do
-      directory_upload 'test', '/tmp/'
-      cd '/tmp'
-      ruby :I, 'lib/', :I, 'test/', :r, 'rubygems', 'test/test_all.rb'
-    end
-    
-    after :install_rubyforge, :install_github
-  end
-  
-  install_gem do
-    before :package_gem
-    remote :root do
-      disable_safe_mode
-      file_upload "pkg/net-ssh-*.gem", "/tmp/"
-      gem_install "/tmp/net-ssh-*.gem"
-    end
-  end
-  
-  package_gem do
-    local do
-      rm :r, :f, 'pkg'
-      rake 'package'
-    end
-  end
-  
-  remove do
-    remote :root do
-      gem_uninstall 'net-ssh'
-    end
-  end
-  
-  installdeps do
-    remote :root do
-      gem_install "rye", "test-unit", "mocha"
-      rye 'authorize-local'
-    end
-  end
-  
-  sysupdate do
-    remote :root do                  
-      apt_get "update"               
-      apt_get "install", "build-essential", "git-core"
-      apt_get "install", "ruby1.8-dev", "rdoc", "libzlib-ruby", "rubygems"
-      mkdir :p, "/var/lib/gems/1.8/bin" # Doesn't get created, but causes Rubygems to fail
-      gem_install "builder", "session"
-      gem_install 'rubygems-update', "-v=1.3.4"  # circular issue with 1.3.5 and hoe
-      update_rubygems
-    end
-  end
-end
-

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

@@ -1,85 +0,0 @@
-require 'jruby_pageant'
-
-module Net; module SSH; module Authentication
-
-  # This class implements an agent for JRuby + Pageant.
-  #
-  # Written by Artūras Šlajus <arturas.slajus@gmail.com>
-  class Agent
-    include Loggable
-    include JRubyPageant
-
-    # A simple module for extending keys, to allow blobs and comments to be
-    # specified for them.
-    module Key
-      # :blob is used by OpenSSL::PKey::RSA#to_blob
-      attr_accessor :java_blob
-      attr_accessor :comment
-    end
-
-    # Instantiates a new agent object, connects to a running SSH agent,
-    # negotiates the agent protocol version, and returns the agent object.
-    def self.connect(logger=nil)
-      agent = new(logger)
-      agent.connect!
-      agent
-    end
-
-    # Creates a new Agent object, using the optional logger instance to
-    # report status.
-    def initialize(logger=nil)
-      self.logger = logger
-    end
-
-    # Connect to the agent process using the socket factory and socket name
-    # given by the attribute writers. If the agent on the other end of the
-    # socket reports that it is an SSH2-compatible agent, this will fail
-    # (it only supports the ssh-agent distributed by OpenSSH).
-    def connect!
-      debug { "connecting to Pageant ssh-agent (via java connector)" }
-      @agent_proxy = JRubyPageant.create
-      unless @agent_proxy.is_running
-        raise AgentNotAvailable, "Pageant is not running!"
-      end
-      debug { "connection to Pageant ssh-agent (via java connector) succeeded" }
-    rescue AgentProxyException => e
-      error { "could not connect to Pageant ssh-agent (via java connector)" }
-      raise AgentNotAvailable, e.message, e.backtrace
-    end
-
-    # Return an array of all identities (public keys) known to the agent.
-    # Each key returned is augmented with a +comment+ property which is set
-    # to the comment returned by the agent for that key.
-    def identities
-      debug { "getting identities from Pageant" }
-      @agent_proxy.get_identities.map do |identity|
-        blob = identity.get_blob
-        key = Buffer.new(String.from_java_bytes(blob)).read_key
-        key.extend(Key)
-        key.java_blob = blob
-        key.comment = String.from_java_bytes(identity.get_comment)
-        key
-      end
-    rescue AgentProxyException => e
-      raise AgentError, "Cannot get identities: #{e.message}", e.backtrace
-    end
-
-    # Simulate agent close. This agent reference is no longer able to
-    # query the agent.
-    def close
-      @agent_proxy = nil
-    end
-
-    # Using the agent and the given public key, sign the given data. The
-    # signature is returned in SSH2 format.
-    def sign(key, data)
-      signed = @agent_proxy.sign(key.java_blob, data.to_java_bytes)
-      String.from_java_bytes(signed)
-    rescue AgentProxyException => e
-      raise AgentError,
-        "agent could not sign data with requested identity: #{e.message}",
-        e.backtrace
-    end
-  end
-
-end; end; end

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

@@ -1,178 +0,0 @@
-require 'net/ssh/transport/server_version'
-
-# Only load pageant on Windows
-if Net::SSH::Authentication::PLATFORM == :win32
-  require 'net/ssh/authentication/pageant'
-end
-
-module Net; module SSH; module Authentication
-
-  # This class implements a simple client for the ssh-agent protocol. It
-  # does not implement any specific protocol, but instead copies the
-  # behavior of the ssh-agent functions in the OpenSSH library (3.8).
-  #
-  # This means that although it behaves like a SSH1 client, it also has
-  # some SSH2 functionality (like signing data).
-  class Agent
-    include Loggable
-
-    # A simple module for extending keys, to allow comments to be specified
-    # for them.
-    module Comment
-      attr_accessor :comment
-    end
-
-    SSH2_AGENT_REQUEST_VERSION    = 1
-    SSH2_AGENT_REQUEST_IDENTITIES = 11
-    SSH2_AGENT_IDENTITIES_ANSWER  = 12
-    SSH2_AGENT_SIGN_REQUEST       = 13
-    SSH2_AGENT_SIGN_RESPONSE      = 14
-    SSH2_AGENT_FAILURE            = 30
-    SSH2_AGENT_VERSION_RESPONSE   = 103
-
-    SSH_COM_AGENT2_FAILURE        = 102
-
-    SSH_AGENT_REQUEST_RSA_IDENTITIES = 1
-    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.
-    attr_reader :socket
-
-    # Instantiates a new agent object, connects to a running SSH agent,
-    # negotiates the agent protocol version, and returns the agent object.
-    def self.connect(logger=nil)
-      agent = new(logger)
-      agent.connect!
-      agent.negotiate!
-      agent
-    end
-
-    # Creates a new Agent object, using the optional logger instance to
-    # report status.
-    def initialize(logger=nil)
-      self.logger = logger
-    end
-
-    # Connect to the agent process using the socket factory and socket name
-    # given by the attribute writers. If the agent on the other end of the
-    # socket reports that it is an SSH2-compatible agent, this will fail
-    # (it only supports the ssh-agent distributed by OpenSSH).
-    def connect!
-      begin
-        debug { "connecting to ssh-agent" }
-        @socket = agent_socket_factory.open(ENV['SSH_AUTH_SOCK'])
-      rescue
-        error { "could not connect to ssh-agent" }
-        raise AgentNotAvailable, $!.message
-      end
-    end
-
-    # Attempts to negotiate the SSH agent protocol version. Raises an error
-    # if the version could not be negotiated successfully.
-    def negotiate!
-      # determine what type of agent we're communicating with
-      type, body = send_and_wait(SSH2_AGENT_REQUEST_VERSION, :string, Transport::ServerVersion::PROTO_VERSION)
-
-      if type == SSH2_AGENT_VERSION_RESPONSE
-        raise AgentNotAvailable, "SSH2 agents are not yet supported"
-      elsif type == SSH2_AGENT_FAILURE
-        debug { "Unexpected response type==#{type}, this will be ignored" }
-      elsif type != SSH_AGENT_RSA_IDENTITIES_ANSWER1 && type != SSH_AGENT_RSA_IDENTITIES_ANSWER2
-        raise AgentNotAvailable, "unknown response from agent: #{type}, #{body.to_s.inspect}"
-      end
-    end
-
-    # Return an array of all identities (public keys) known to the agent.
-    # Each key returned is augmented with a +comment+ property which is set
-    # to the comment returned by the agent for that key.
-    def identities
-      type, body = send_and_wait(SSH2_AGENT_REQUEST_IDENTITIES)
-      raise AgentError, "could not get identity count" if agent_failed(type)
-      raise AgentError, "bad authentication reply: #{type}" if type != SSH2_AGENT_IDENTITIES_ANSWER
-
-      identities = []
-      body.read_long.times do
-        key_str = body.read_string
-        comment_str = body.read_string
-        begin
-          key = Buffer.new(key_str).read_key
-          key.extend(Comment)
-          key.comment = comment_str
-          identities.push key
-        rescue NotImplementedError => e
-          error { "ignoring unimplemented key:#{e.message} #{comment_str}" }
-        end
-      end
-
-      return identities
-    end
-
-    # Closes this socket. This agent reference is no longer able to
-    # query the agent.
-    def close
-      @socket.close
-    end
-
-    # Using the agent and the given public key, sign the given data. The
-    # signature is returned in SSH2 format.
-    def sign(key, data)
-      type, reply = send_and_wait(SSH2_AGENT_SIGN_REQUEST, :string, Buffer.from(:key, key), :string, data, :long, 0)
-
-      if agent_failed(type)
-        raise AgentError, "agent could not sign data with requested identity"
-      elsif type != SSH2_AGENT_SIGN_RESPONSE
-        raise AgentError, "bad authentication response #{type}"
-      end
-
-      return reply.read_string
-    end
-
-    private
-
-    # Returns the agent socket factory to use.
-    def agent_socket_factory
-      if Net::SSH::Authentication::PLATFORM == :win32
-        Pageant::Socket
-      else
-        UNIXSocket
-      end
-    end
-
-    # Send a new packet of the given type, with the associated data.
-    def send_packet(type, *args)
-      buffer = Buffer.from(*args)
-      data = [buffer.length + 1, type.to_i, buffer.to_s].pack("NCA*")
-      debug { "sending agent request #{type} len #{buffer.length}" }
-      @socket.send data, 0
-    end
-
-    # Read the next packet from the agent. This will return a two-part
-    # tuple consisting of the packet type, and the packet's body (which
-    # is returned as a Net::SSH::Buffer).
-    def read_packet
-      buffer = Net::SSH::Buffer.new(@socket.read(4))
-      buffer.append(@socket.read(buffer.read_long))
-      type = buffer.read_byte
-      debug { "received agent packet #{type} len #{buffer.length-4}" }
-      return type, buffer
-    end
-
-    # Send the given packet and return the subsequent reply from the agent.
-    # (See #send_packet and #read_packet).
-    def send_and_wait(type, *args)
-      send_packet(type, *args)
-      read_packet
-    end
-
-    # Returns +true+ if the parameter indicates a "failure" response from
-    # the agent, and +false+ otherwise.
-    def agent_failed(type)
-      type == SSH_AGENT_FAILURE ||
-        type == SSH2_AGENT_FAILURE ||
-        type == SSH_COM_AGENT2_FAILURE
-    end
-  end
-
-end; end; end