This is an automated email from the ASF dual-hosted git repository. twolf pushed a commit to branch dev_3.0 in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 570e058d198f291998fe12fdb47825ae4a35fd56 Merge: 9ef3d786a 084e69b81 Author: Thomas Wolf <[email protected]> AuthorDate: Thu Aug 28 16:12:57 2025 +0200 Merge branch 'master' into 3.0.0 .../org/apache/sshd/common/config/keys/KeyUtils.java | 20 ++------------------ .../common/config/keys/u2f/SkED25519PublicKey.java | 6 ++++-- .../common/config/keys/u2f/SkEcdsaPublicKey.java | 6 ++++-- .../sshd/server/auth/UserAuthPublicKeySkTest.java | 7 +++---- 4 files changed, 13 insertions(+), 26 deletions(-) diff --cc sshd-common/src/main/java/org/apache/sshd/common/config/keys/KeyUtils.java index 4e69c6565,156be3327..7522a1456 --- a/sshd-common/src/main/java/org/apache/sshd/common/config/keys/KeyUtils.java +++ b/sshd-common/src/main/java/org/apache/sshd/common/config/keys/KeyUtils.java @@@ -1044,20 -1258,18 +1036,12 @@@ public final class KeyUtils } public static boolean compareSkEd25519Keys(SkED25519PublicKey k1, SkED25519PublicKey k2) { - if (Objects.equals(k1, k2)) { - return true; - } else if (k1 == null || k2 == null) { - return false; // both null is covered by Objects#equals - } - return Objects.equals(k1.getAppName(), k2.getAppName()) - && Objects.equals(k1.isNoTouchRequired(), k2.isNoTouchRequired()) - && Objects.equals(k1.isVerifyRequired(), k2.isVerifyRequired()) - && SecurityUtils.compareEDDSAPPublicKeys(k1.getDelegatePublicKey(), k2.getDelegatePublicKey()); + return Objects.equals(k1, k2); } - public static String getSignatureAlgorithm(String chosenAlgorithm, PublicKey key) { - // check key as we know only certificates require a mapped signature algorithm currently - if (key instanceof OpenSshCertificate) { - synchronized (SIGNATURE_ALGORITHM_MAP) { - return SIGNATURE_ALGORITHM_MAP.get(chosenAlgorithm); - } - } else { - return chosenAlgorithm; - } + public static String getSignatureAlgorithm(String chosenAlgorithm) { + String mapped = SIGNATURE_ALGORITHM_MAP.get(chosenAlgorithm); + return mapped == null ? chosenAlgorithm : mapped; } public static boolean isCertificateAlgorithm(String algorithm) {
