diff options
| author | Thomas Wolf | 2018-08-09 10:03:45 +0000 |
|---|---|---|
| committer | Thomas Wolf | 2018-08-09 10:06:49 +0000 |
| commit | bd1a82502680b5de5bf86f6c4470185fd1602386 (patch) | |
| tree | ac81773107b95c49993bd5b2697dc327a249fc20 | |
| parent | cf6463bddc879bdf8ed500d80f826d645fcf9dc2 (diff) | |
| parent | 09753591fae875cee71eb5674a0103844351e508 (diff) | |
| download | jgit-bd1a82502680b5de5bf86f6c4470185fd1602386.tar.gz jgit-bd1a82502680b5de5bf86f6c4470185fd1602386.tar.xz jgit-bd1a82502680b5de5bf86f6c4470185fd1602386.zip | |
Merge remote-tracking branch 'origin/stable-5.0'
* stable-5.0:
Ensure that JSch knows HostKeyAlgorithms ssh-rsa and ssh-dss
Change-Id: I76899a1f6b3d9348d138266e05e1320b7429bfd1
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/transport/JschConfigSessionFactory.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/JschConfigSessionFactory.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/JschConfigSessionFactory.java index 1d5248a15d..eab3b3c0cc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/JschConfigSessionFactory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/JschConfigSessionFactory.java @@ -372,6 +372,8 @@ public abstract class JschConfigSessionFactory extends SshSessionFactory { */ protected JSch createDefaultJSch(FS fs) throws JSchException { final JSch jsch = new JSch(); + 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$ configureJSch(jsch); knownHosts(jsch, fs); identities(jsch, fs); |