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 f2bf2faa0485b134edc2b60fbcee8106691cc4e9 Author: Thomas Wolf <[email protected]> AuthorDate: Mon Sep 15 00:13:23 2025 +0200 Minor clean-up related to ed25519 --- .../util/security/bouncycastle/BouncyCastlePublicKeyFactory.java | 4 ++-- .../sshd/common/util/security/eddsa/generic/EdDSAKeyTypeDetector.java | 2 +- .../sshd/common/util/security/eddsa/generic/EdDSAKeyTypeDetector.java | 2 +- .../sshd/common/util/security/eddsa/jce/JcePublicKeyFactory.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sshd-common/src/main/java/org/apache/sshd/common/util/security/bouncycastle/BouncyCastlePublicKeyFactory.java b/sshd-common/src/main/java/org/apache/sshd/common/util/security/bouncycastle/BouncyCastlePublicKeyFactory.java index 4eeb036f0..0496cd647 100644 --- a/sshd-common/src/main/java/org/apache/sshd/common/util/security/bouncycastle/BouncyCastlePublicKeyFactory.java +++ b/sshd-common/src/main/java/org/apache/sshd/common/util/security/bouncycastle/BouncyCastlePublicKeyFactory.java @@ -35,13 +35,13 @@ public final class BouncyCastlePublicKeyFactory implements PublicKeyFactory { @Override public PublicKey getPublicKey(PrivateKey key) { - if (SecurityUtils.ED25519.equals(key.getAlgorithm())) { + if (SecurityUtils.ED25519.equalsIgnoreCase(key.getAlgorithm())) { return getPublicEdDSAKey(key); } return null; } - public PublicKey getPublicEdDSAKey(PrivateKey key) { + private static PublicKey getPublicEdDSAKey(PrivateKey key) { if (key instanceof EdDSAPrivateKey) { EdDSAPrivateKey edDSAKey = (EdDSAPrivateKey) key; return edDSAKey.getPublicKey(); diff --git a/sshd-common/src/main/java/org/apache/sshd/common/util/security/eddsa/generic/EdDSAKeyTypeDetector.java b/sshd-common/src/main/java/org/apache/sshd/common/util/security/eddsa/generic/EdDSAKeyTypeDetector.java index f35d1a43b..fc5b9d168 100644 --- a/sshd-common/src/main/java/org/apache/sshd/common/util/security/eddsa/generic/EdDSAKeyTypeDetector.java +++ b/sshd-common/src/main/java/org/apache/sshd/common/util/security/eddsa/generic/EdDSAKeyTypeDetector.java @@ -33,7 +33,7 @@ public final class EdDSAKeyTypeDetector { return false; } String algorithm = key.getAlgorithm(); - if (SecurityUtils.ED25519.equals(algorithm)) { + if (SecurityUtils.ED25519.equalsIgnoreCase(algorithm)) { return true; } if (SecurityUtils.EDDSA.equalsIgnoreCase(algorithm)) { diff --git a/sshd-common/src/main/java15/org/apache/sshd/common/util/security/eddsa/generic/EdDSAKeyTypeDetector.java b/sshd-common/src/main/java15/org/apache/sshd/common/util/security/eddsa/generic/EdDSAKeyTypeDetector.java index bf6cc143d..9c7da9f1f 100644 --- a/sshd-common/src/main/java15/org/apache/sshd/common/util/security/eddsa/generic/EdDSAKeyTypeDetector.java +++ b/sshd-common/src/main/java15/org/apache/sshd/common/util/security/eddsa/generic/EdDSAKeyTypeDetector.java @@ -35,7 +35,7 @@ public final class EdDSAKeyTypeDetector { return false; } String algorithm = key.getAlgorithm(); - if (SecurityUtils.ED25519.equals(algorithm)) { + if (SecurityUtils.ED25519.equalsIgnoreCase(algorithm)) { return true; } if (SecurityUtils.EDDSA.equalsIgnoreCase(algorithm)) { diff --git a/sshd-common/src/main/java15/org/apache/sshd/common/util/security/eddsa/jce/JcePublicKeyFactory.java b/sshd-common/src/main/java15/org/apache/sshd/common/util/security/eddsa/jce/JcePublicKeyFactory.java index 06fb1b9f5..a91c1479b 100644 --- a/sshd-common/src/main/java15/org/apache/sshd/common/util/security/eddsa/jce/JcePublicKeyFactory.java +++ b/sshd-common/src/main/java15/org/apache/sshd/common/util/security/eddsa/jce/JcePublicKeyFactory.java @@ -40,7 +40,7 @@ public class JcePublicKeyFactory implements PublicKeyFactory { @Override public PublicKey getPublicKey(PrivateKey key) { - if (SecurityUtils.EDDSA.equals(key.getAlgorithm()) && (key instanceof EdECKey)) { + if (SecurityUtils.EDDSA.equalsIgnoreCase(key.getAlgorithm()) && (key instanceof EdECKey)) { NamedParameterSpec params = ((EdECKey) key).getParams(); return recoverEd25519PublicKey(key, params); }
