Permalink
Browse files

Merge pull request #73 from rubyphunk/master

Small doc fix and correct error class for PKey::EC key type
  • Loading branch information...
delano committed Jan 10, 2013
2 parents 01ccaf5 + 7df9081 commit e843bfac1bbd33578f949a89b9833f86e3ae1237
Showing with 2 additions and 2 deletions.
  1. +1 −1 lib/net/ssh/key_factory.rb
  2. +1 −1 lib/net/ssh/service/forward.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
@@ -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

0 comments on commit e843bfa

Please sign in to comment.