aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2018-08-09 06:55:56 -0400
committerThomas Wolf2018-08-09 06:56:54 -0400
commitfbe808a18a21a6abb35a965cf2bb5bde026d2248 (patch)
tree727eb3dc9a93b24a4357fff2f1761e8cef1729c1
parent6f3d8fda4f5367a7504f37856c263231b706e3ef (diff)
parent120d18103d823f3d70f58a4291831400a36d0465 (diff)
downloadegit-fbe808a18a21a6abb35a965cf2bb5bde026d2248.tar.gz
egit-fbe808a18a21a6abb35a965cf2bb5bde026d2248.tar.xz
egit-fbe808a18a21a6abb35a965cf2bb5bde026d2248.zip
Merge remote-tracking branch 'origin/stable-5.0'
* stable-5.0: Ensure that JSch knows HostKeyAlgorithms ssh-rsa and ssh-dss Change-Id: I125bd46077ed59f7b2810b338856b527035f3029 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.