diff options
| author | delano <delano@solutious.com> | 2012-05-25 14:46:25 -0400 |
|---|---|---|
| committer | delano <delano@solutious.com> | 2012-05-25 14:46:25 -0400 |
| commit | 6a373b823f856830efce7556482fa57145b26f87 (patch) | |
| tree | 1a24cb4ea2124a66053ca441e79af3d9a5c8c45e /lib | |
| parent | 6abf9af8b1573582c129371cd5a07cfe742fbdd5 (diff) | |
| parent | 21dde273463f5aae11dcad34dfb3feb08dc81375 (diff) | |
| download | net-ssh-2.5.tar.gz | |
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/net/ssh/known_hosts.rb | 20 | ||||
| -rw-r--r-- | lib/net/ssh/version.rb | 2 |
2 files changed, 12 insertions, 10 deletions
diff --git a/lib/net/ssh/known_hosts.rb b/lib/net/ssh/known_hosts.rb index 7cbbdaf..2b2419a 100644 --- a/lib/net/ssh/known_hosts.rb +++ b/lib/net/ssh/known_hosts.rb @@ -10,16 +10,18 @@ module Net; module SSH # This is used internally by Net::SSH, and will never need to be used directly # by consumers of the library. class KnownHosts - class <<self - if defined?(OpenSSL::PKey::EC) - SUPPORTED_TYPE = %w(ssh-rsa ssh-dss - ecdsa-sha2-nistp256 - ecdsa-sha2-nistp384 - ecdsa-sha2-nistp521) - else - SUPPORTED_TYPE = %w(ssh-rsa ssh-dss) - end + if defined?(OpenSSL::PKey::EC) + SUPPORTED_TYPE = %w(ssh-rsa ssh-dss + ecdsa-sha2-nistp256 + ecdsa-sha2-nistp384 + ecdsa-sha2-nistp521) + else + SUPPORTED_TYPE = %w(ssh-rsa ssh-dss) + end + + + class <<self # Searches all known host files (see KnownHosts.hostfiles) for all keys # of the given host. Returns an array of keys found. diff --git a/lib/net/ssh/version.rb b/lib/net/ssh/version.rb index f28010c..a6894fc 100644 --- a/lib/net/ssh/version.rb +++ b/lib/net/ssh/version.rb @@ -51,7 +51,7 @@ module Net; module SSH MINOR = 5 # 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) |