diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2022-01-06 14:05:00 -0500 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2022-01-06 14:05:00 -0500 |
| commit | df4fa808b3a872fda33418a931dcaf3ab8699f10 (patch) | |
| tree | 1d37a7628c9e416cf62a8eb64330e021f8e2ac08 /org.eclipse.jgit.ssh.apache/src | |
| parent | e4f6e0af4ac3f83418e98bbfeccb94493c870b83 (diff) | |
| parent | 4c555f0742856bb21efcb2df53c7ceac921ffe80 (diff) | |
| download | jgit-df4fa808b3a872fda33418a931dcaf3ab8699f10.tar.gz jgit-df4fa808b3a872fda33418a931dcaf3ab8699f10.zip | |
Merge changes Ia744cd4a,Id95350c7,I746b7fb7
* changes:
sshd: backport upstream fix for SSHD-1231
[releng] bump japicmp base version and configure sshd bundles
Merge branch 'stable-6.0'
Diffstat (limited to 'org.eclipse.jgit.ssh.apache/src')
| -rw-r--r-- | org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitPublicKeyAuthentication.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitPublicKeyAuthentication.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitPublicKeyAuthentication.java index c082a9a963..2996a221ce 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitPublicKeyAuthentication.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitPublicKeyAuthentication.java @@ -108,4 +108,18 @@ public class JGitPublicKeyAuthentication extends UserAuthPublicKey { }; } } + + @Override + protected PublicKeyIdentity resolveAttemptedPublicKeyIdentity( + ClientSession session, String service) throws Exception { + PublicKeyIdentity result = super.resolveAttemptedPublicKeyIdentity( + session, service); + // This fixes SSHD-1231. Can be removed once we're using Apache MINA + // sshd > 2.8.0. + // + // See https://issues.apache.org/jira/browse/SSHD-1231 + currentAlgorithms.clear(); + return result; + } + } |