Merge pull request #27 from Aga303/add-id_ed25519

Add default key ~/.ssh/id_ed25519
jenkinsci · Feb 14, 2018 · 4c7d6a0 · 4c7d6a0
2 parents 96dc453 + 242af27
commit 4c7d6a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/sshcredentials/impl/BasicSSHUserPrivateKey.java b/src/main/java/com/cloudbees/jenkins/plugins/sshcredentials/impl/BasicSSHUserPrivateKey.java
@@ -497,7 +497,7 @@ public UsersPrivateKeySource() {
         private List<File> files() {
             List<File> files = new ArrayList<File>();
             File sshHome = new File(new File(System.getProperty("user.home")), ".ssh");
-            for (String keyName : Arrays.asList("id_ecdsa", "id_rsa", "id_dsa", "identity")) {
+            for (String keyName : Arrays.asList("id_ecdsa", "id_ed25519", "id_rsa", "id_dsa", "identity")) {
                 File key = new File(sshHome, keyName);
                 if (key.isFile()) {
                     files.add(key);

diff --git a/...enkins/plugins/sshcredentials/impl/BasicSSHUserPrivateKey/UsersPrivateKeySource/help.html b/...enkins/plugins/sshcredentials/impl/BasicSSHUserPrivateKey/UsersPrivateKeySource/help.html
@@ -2,6 +2,7 @@
     The following files will be read if present:
     <ul>
         <li><code>~/.ssh/id_ecdsa</code></li>
+        <li><code>~/.ssh/id_ed25519</code></li>
         <li><code>~/.ssh/id_rsa</code></li>
         <li><code>~/.ssh/id_dsa</code></li>
         <li><code>~/.ssh/identity</code></li>