Merge branch 'stable-2.14'
* stable-2.14:
Bump Mina core to 2.0.16 and sshd to 1.4
Change-Id: I9184620c384325ae1ffc88c0ebf4ba0e009bc6d9
diff --git a/WORKSPACE b/WORKSPACE
index 1a1a938..c503f91 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -611,14 +611,14 @@
maven_jar(
name = "sshd",
- artifact = "org.apache.sshd:sshd-core:1.2.0",
- sha1 = "4bc24a8228ba83dac832680366cf219da71dae8e",
+ artifact = "org.apache.sshd:sshd-core:1.4.0",
+ sha1 = "c8f3d7457fc9979d1b9ec319f0229b89793c8e56",
)
maven_jar(
name = "mina_core",
- artifact = "org.apache.mina:mina-core:2.0.10",
- sha1 = "a1cb1136b104219d6238de886bf5a3ea4554eb58",
+ artifact = "org.apache.mina:mina-core:2.0.16",
+ sha1 = "f720f17643eaa7b0fec07c1d7f6272972c02bba4",
)
maven_jar(
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSshd.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSshd.java
index 67e0eb4..d3d4853 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSshd.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSshd.java
@@ -32,7 +32,7 @@
import java.net.InetSocketAddress;
import java.nio.file.Files;
import java.nio.file.Path;
-import org.apache.sshd.common.util.SecurityUtils;
+import org.apache.sshd.common.util.security.SecurityUtils;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
/** Initialize the {@code sshd} configuration section. */
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java
index c245667..589014c 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java
@@ -23,9 +23,9 @@
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 @@
+ stdKeys
+ "");
}
- AbstractFileKeyPairProvider kp = SecurityUtils.createFileKeyPairProvider();
+ FileKeyPairProvider kp = new FileKeyPairProvider();
kp.setFiles(stdKeys);
return kp;
}
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
index 0a9e182..f573c1d 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
@@ -86,10 +86,10 @@
import org.apache.sshd.common.random.SingletonRandomFactory;
import org.apache.sshd.common.session.ConnectionService;
import org.apache.sshd.common.session.Session;
-import org.apache.sshd.common.util.SecurityUtils;
import org.apache.sshd.common.util.buffer.Buffer;
import org.apache.sshd.common.util.buffer.ByteArrayBuffer;
import org.apache.sshd.common.util.net.SshdSocketAddress;
+import org.apache.sshd.common.util.security.SecurityUtils;
import org.apache.sshd.server.Command;
import org.apache.sshd.server.CommandFactory;
import org.apache.sshd.server.ServerBuilder;
@@ -683,12 +683,12 @@
setTcpipForwardingFilter(
new ForwardingFilter() {
@Override
- public boolean canForwardAgent(Session session) {
+ public boolean canForwardAgent(Session session, String requestType) {
return false;
}
@Override
- public boolean canForwardX11(Session session) {
+ public boolean canForwardX11(Session session, String requestType) {
return false;
}
