opendev/gerrit
Code Issues Proposed changes

Update sshd-core to 1.0.0 and mina to 2.10

Browse Source 
This version includes several bug fixes and improvements.  See
the release note [1] for details.

Many packages have been renamed, and some classes removed.

FileKeyPairProvider was removed from the SSHD library, so we need to
borrow it from the previous release. We preserve the license, that is
the same as Gerrit Code Review, the header and the indentation.

Compilation warnings are fixed, mostly by adding missing @Override
annotations.

[1] https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12323302&styleName=Html&projectId=12310849

Change-Id: If047c3a279fc9c98a59ac3102b0db3f5f2fdae48
This commit is contained in:
David Ostrovsky
2015-12-07 15:01:03 +09:00
committed by David Ostrovsky
parent 343104481e
commit e8a521447d
15 changed files with 294 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,8 +19,7 @@ import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.ProvisionException;
import org.apache.sshd.common.KeyPairProvider;
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.server.keyprovider.SimpleGeneratorHostKeyProvider;
@@ -54,7 +53,7 @@ class HostKeyProvider implements Provider<KeyPairProvider> {
if (Files.exists(objKey)) {
if (stdKeys.isEmpty()) {
SimpleGeneratorHostKeyProvider p = new SimpleGeneratorHostKeyProvider();
p.setPath(objKey.toAbsolutePath().toString());
p.setPath(objKey.toAbsolutePath());
return p;
} else {