diff options
| -rw-r--r-- | .classpath | 2 | ||||
| -rw-r--r-- | build.moxie | 2 | ||||
| -rw-r--r-- | gitblit.iml | 6 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/transport/ssh/SshDaemon.java | 9 | ||||
| -rw-r--r-- | src/test/java/com/gitblit/tests/SshUnitTest.java | 2 |
5 files changed, 12 insertions, 9 deletions
@@ -55,7 +55,7 @@ <classpathentry kind="lib" path="ext/bcmail-jdk15on-1.57.jar" sourcepath="ext/src/bcmail-jdk15on-1.57.jar" /> <classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.57.jar" sourcepath="ext/src/bcpkix-jdk15on-1.57.jar" /> <classpathentry kind="lib" path="ext/eddsa-0.2.0.jar" sourcepath="ext/src/eddsa-0.2.0.jar" /> - <classpathentry kind="lib" path="ext/sshd-core-1.6.0.jar" sourcepath="ext/src/sshd-core-1.6.0.jar" /> + <classpathentry kind="lib" path="ext/sshd-core-1.7.0.jar" sourcepath="ext/src/sshd-core-1.7.0.jar" /> <classpathentry kind="lib" path="ext/mina-core-2.0.21.jar" sourcepath="ext/src/mina-core-2.0.21.jar" /> <classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar" /> <classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0.jar" /> diff --git a/build.moxie b/build.moxie index 8857dca8..026ab5bb 100644 --- a/build.moxie +++ b/build.moxie @@ -114,7 +114,7 @@ properties: { bouncycastle.version : 1.57 selenium.version : 2.28.0 wikitext.version : 1.4 - sshd.version: 1.6.0 + sshd.version: 1.7.0 mina.version: 2.0.21 guice.version : 4.0 # Gitblit maintains a fork of guice-servlet diff --git a/gitblit.iml b/gitblit.iml index 5d54b431..694cd94f 100644 --- a/gitblit.iml +++ b/gitblit.iml @@ -552,13 +552,13 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="sshd-core-1.6.0.jar"> + <library name="sshd-core-1.7.0.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/sshd-core-1.6.0.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/sshd-core-1.7.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/sshd-core-1.6.0.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/sshd-core-1.7.0.jar!/" /> </SOURCES> </library> </orderEntry> diff --git a/src/main/java/com/gitblit/transport/ssh/SshDaemon.java b/src/main/java/com/gitblit/transport/ssh/SshDaemon.java index 405c794e..8bb880b0 100644 --- a/src/main/java/com/gitblit/transport/ssh/SshDaemon.java +++ b/src/main/java/com/gitblit/transport/ssh/SshDaemon.java @@ -95,11 +95,14 @@ public class SshDaemon { // Ensure that Bouncy Castle is our JCE provider SecurityUtils.registerSecurityProvider(new BouncyCastleSecurityProviderRegistrar()); - // Add support for ED25519_SHA512 - SecurityUtils.registerSecurityProvider(new EdDSASecurityProviderRegistrar()); if (SecurityUtils.isBouncyCastleRegistered()) { log.info("BouncyCastle is registered as a JCE provider"); } + // Add support for ED25519_SHA512 + SecurityUtils.registerSecurityProvider(new EdDSASecurityProviderRegistrar()); + if (SecurityUtils.isProviderRegistered("EdDSA")) { + log.info("EdDSA is registered as a JCE provider"); + } // Generate host RSA and DSA keypairs and create the host keypair provider File rsaKeyStore = new File(gitblit.getBaseFolder(), "ssh-rsa-hostkey.pem"); @@ -164,7 +167,7 @@ public class SshDaemon { sshd.setSessionFactory(new SshServerSessionFactory(sshd)); sshd.setFileSystemFactory(new DisabledFilesystemFactory()); - sshd.setTcpipForwardingFilter(new NonForwardingFilter()); + sshd.setForwardingFilter(new NonForwardingFilter()); sshd.setCommandFactory(new SshCommandFactory(gitblit, workQueue)); sshd.setShellFactory(new WelcomeShell(gitblit)); diff --git a/src/test/java/com/gitblit/tests/SshUnitTest.java b/src/test/java/com/gitblit/tests/SshUnitTest.java index 2f65fe99..acb0269c 100644 --- a/src/test/java/com/gitblit/tests/SshUnitTest.java +++ b/src/test/java/com/gitblit/tests/SshUnitTest.java @@ -36,7 +36,7 @@ import org.apache.sshd.client.future.AuthFuture; import org.apache.sshd.client.keyverifier.ServerKeyVerifier; import org.apache.sshd.client.session.ClientSession; import org.apache.sshd.common.config.keys.FilePasswordProvider; -import org.apache.sshd.common.util.SecurityUtils; +import org.apache.sshd.common.util.security.SecurityUtils; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.util.FS; |