Browse Source

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>
stable-5.1
Thomas Wolf 6 years ago
parent
commit
bd1a825026
  1. 2
      org.eclipse.jgit/src/org/eclipse/jgit/transport/JschConfigSessionFactory.java

2
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 { protected JSch createDefaultJSch(FS fs) throws JSchException {
final JSch jsch = new JSch(); 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); configureJSch(jsch);
knownHosts(jsch, fs); knownHosts(jsch, fs);
identities(jsch, fs); identities(jsch, fs);

Loading…
Cancel
Save