opendev/gerrit
Code Issues Proposed changes

Bump Mina core to 2.0.16 and sshd to 1.4

Browse Source 
This release moves to Java 8 and fixes various bugs. See the sshd-core
release notes [1] and mina-project page [2] for details.

[1] https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310849&version=12338322
[2] https://mina.apache.org/mina-project/

Change-Id: I5df8540fa96f91126ccd45446a070f2000436b15
This commit is contained in:
David Ostrovsky
2016-09-29 08:27:30 +02:00
committed by David Pursehouse
parent 11badbbcc1
commit 12c48938cd
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,9 +23,9 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import org.apache.sshd.common.keyprovider.AbstractFileKeyPairProvider;
import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
import org.apache.sshd.common.keyprovider.KeyPairProvider;
import org.apache.sshd.common.util.SecurityUtils;
import org.apache.sshd.common.util.security.SecurityUtils;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
class HostKeyProvider implements Provider<KeyPairProvider> {
@@ -72,7 +72,7 @@ class HostKeyProvider implements Provider<KeyPairProvider> {
+ stdKeys
+ "");
}
AbstractFileKeyPairProvider kp = SecurityUtils.createFileKeyPairProvider();
FileKeyPairProvider kp = new FileKeyPairProvider();
kp.setFiles(stdKeys);
return kp;
}