commit 99550098d4ad3125c527597894272bee027e04c4
author Paladox none <thomasmulhall410@yahoo.com> Sun May 07 12:21:44 2017 +0000
committer David Pursehouse <dpursehouse@collab.net> Mon May 08 01:40:09 2017 +0000
tree b38d2fe16605ab8bde7915ecc5ab566d47971db8
parent acf39dacf53f4cd483efd8979eacf2c1bc251153

DatabasePubKeyAuth: Also look for ecdsa keys and ed25519 keys

Change-Id: I13ca777bfd9f4b27d6579fdb8db5a9c0fb1102d3

gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java

diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java
index 5f425d1..d655500 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java
@@ -81,7 +81,11 @@
   }
 
   private static Set<PublicKey> myHostKeys(KeyPairProvider p) {
-    final Set<PublicKey> keys = new HashSet<>(2);
+    final Set<PublicKey> keys = new HashSet<>(6);
+    addPublicKey(keys, p, KeyPairProvider.SSH_ED25519);
+    addPublicKey(keys, p, KeyPairProvider.ECDSA_SHA2_NISTP256);
+    addPublicKey(keys, p, KeyPairProvider.ECDSA_SHA2_NISTP384);
+    addPublicKey(keys, p, KeyPairProvider.ECDSA_SHA2_NISTP521);
     addPublicKey(keys, p, KeyPairProvider.SSH_RSA);
     addPublicKey(keys, p, KeyPairProvider.SSH_DSS);
     return keys;