Skip to content
Browse files

Pull latest

  • Loading branch information...
2 parents ba33401 + e843bfa commit a94363a5e925e2f8971155cd514e690c993ebbd2 @delano delano committed Jan 10, 2013
Showing with 7 additions and 3 deletions.
  1. +1 −1 lib/net/ssh/key_factory.rb
  2. +1 −1 lib/net/ssh/service/forward.rb
  3. +3 −0 net-ssh.gemspec
  4. +2 −1 test/common.rb
View
2 lib/net/ssh/key_factory.rb
@@ -61,7 +61,7 @@ def load_data_private_key(data, passphrase=nil, ask_passphrase=true, filename=""
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
View
2 lib/net/ssh/service/forward.rb
@@ -177,7 +177,7 @@ def active_remotes
# 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
View
3 net-ssh.gemspec
@@ -20,6 +20,9 @@
s.add_dependency 'jruby-pageant', ">=1.1.1"
end
+ s.add_development_dependency 'test-unit'
+ s.add_development_dependency 'mocha'
+
s.executables = %w[]
# = MANIFEST =
View
3 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'

0 comments on commit a94363a

Please sign in to comment.
Something went wrong with that request. Please try again.