summaryrefslogtreecommitdiff
path: root/lib/net/ssh/authentication/session.rb
diff options
context:
space:
mode:
authorDelano Mandelbaum <delano@delanotes.com>2014-04-28 11:55:36 -0400
committerDelano Mandelbaum <delano@delanotes.com>2014-04-28 11:55:36 -0400
commit2d9a19efcb26c52110041b6ec76a2078d047f050 (patch)
tree29a7577d622cc13a7d51ce02c4b2d06fd9c6b2ae /lib/net/ssh/authentication/session.rb
parent329485ab81f3b69697ac1723043369c37a99ea2f (diff)
parentb1fc36b983bd580d66ca9c2c65b5167f9cb8fa08 (diff)
downloadnet-ssh-2d9a19efcb26c52110041b6ec76a2078d047f050.tar.gz
Merge pull request #160 from chr4/new-ciphers
New ciphers
Diffstat (limited to 'lib/net/ssh/authentication/session.rb')
-rw-r--r--lib/net/ssh/authentication/session.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/net/ssh/authentication/session.rb b/lib/net/ssh/authentication/session.rb
index c63bf41..5ac2cdc 100644
--- a/lib/net/ssh/authentication/session.rb
+++ b/lib/net/ssh/authentication/session.rb
@@ -133,8 +133,8 @@ module Net; module SSH; module Authentication
# by system default.
def default_keys
if defined?(OpenSSL::PKey::EC)
- %w(~/.ssh/id_dsa ~/.ssh/id_rsa ~/.ssh/id_ecdsa
- ~/.ssh2/id_dsa ~/.ssh2/id_rsa ~/.ssh2/id_ecdsa)
+ %w(~/.ssh/id_ed25519 ~/.ssh/id_rsa ~/.ssh/id_dsa ~/.ssh/id_ecdsa
+ ~/.ssh2/id_ed25519 ~/.ssh2/id_rsa ~/.ssh2/id_dsa ~/.ssh2/id_ecdsa)
else
%w(~/.ssh/id_dsa ~/.ssh/id_rsa ~/.ssh2/id_dsa ~/.ssh2/id_rsa)
end