aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2018-08-08 07:43:17 -0400
committerThomas Wolf2018-08-08 07:43:17 -0400
commit120d18103d823f3d70f58a4291831400a36d0465 (patch)
tree886f6f9af78d2eaff3c2e59a24484fa0dc171f65
parent826f61f1a6a3d1e2e2bec8ce4ca2fb7d6f49b8a5 (diff)
downloadegit-120d18103d823f3d70f58a4291831400a36d0465.tar.gz
egit-120d18103d823f3d70f58a4291831400a36d0465.tar.xz
egit-120d18103d823f3d70f58a4291831400a36d0465.zip
Ensure that JSch knows HostKeyAlgorithms ssh-rsa and ssh-dss
Without these registrations, JSch's up-front checks which algorithms are available at all fail if the ssh config explicitly sets only these algorithms. Bug: 537790 Change-Id: I1e088447c0ce68aea1bb7bf573d7a1e78713b019 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
-rw-r--r--org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseSshSessionFactory.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseSshSessionFactory.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseSshSessionFactory.java
index 0150898ae..0b830ad7f 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseSshSessionFactory.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseSshSessionFactory.java
@@ -35,6 +35,8 @@ class EclipseSshSessionFactory extends JschConfigSessionFactory {
@Override
protected JSch createDefaultJSch(FS fs) throws JSchException {
+ JSch.setConfig("ssh-rsa", JSch.getConfig("signature.rsa")); //$NON-NLS-1$ //$NON-NLS-2$
+ JSch.setConfig("ssh-dss", JSch.getConfig("signature.dss")); //$NON-NLS-1$ //$NON-NLS-2$
// Forcing a dummy session to be created will cause the known hosts
// and configured private keys to be initialized. This is needed by
// our parent class in case non-default JSch instances need to be made.