opendev/gerrit
Code Issues Proposed changes

InitSshd: Generate ecdsa and ed25519 keys if the host supports them

Browse Source 
Change-Id: Iad0fdea4f2acb97207d553ed30fdfbf9b0d83067
This commit is contained in:
Paladox none
2017-05-07 11:04:27 +00:00
committed by David Pursehouse
parent 6a7bf29e8d
commit c3319bf15e
3 changed files with 104 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java
View File

@@ -41,14 +41,22 @@ class HostKeyProvider implements Provider<KeyPairProvider> {
Path objKey = site.ssh_key;
Path rsaKey = site.ssh_rsa;
Path dsaKey = site.ssh_dsa;
Path ecdsaKey = site.ssh_ecdsa;
Path ed25519Key = site.ssh_ed25519;
final List<File> stdKeys = new ArrayList<>(2);
final List<File> stdKeys = new ArrayList<>(4);
if (Files.exists(rsaKey)) {
stdKeys.add(rsaKey.toAbsolutePath().toFile());
}
if (Files.exists(dsaKey)) {
stdKeys.add(dsaKey.toAbsolutePath().toFile());
}
if (Files.exists(ecdsaKey)) {
stdKeys.add(ecdsaKey.toAbsolutePath().toFile());
}
if (Files.exists(ed25519Key)) {
stdKeys.add(ed25519Key.toAbsolutePath().toFile());
}
if (Files.exists(objKey)) {
if (stdKeys.isEmpty()) {