(mina-sshd) branch master updated (8a86e32b2 -> 0da17757a)

[tw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tomaswolf pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git


    from 8a86e32b2 Post-release documentation updates
     new 86da7dfe8 Fix ClientTest.closeCleanBeforeChannelOpened
     new 0da17757a GH-906: Fix finding a signature factory for BC ed25519 keys

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.md                                                             | 1 +
 .../main/java/org/apache/sshd/common/signature/SignatureFactory.java   | 3 ++-
 sshd-core/src/test/java/org/apache/sshd/client/ClientTest.java         | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

(mina-sshd) 01/02: Fix ClientTest.closeCleanBeforeChannelOpened

[tw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tomaswolf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git

commit 86da7dfe8a27ca4c65382a1751059960577a96fd
Author: Thomas Wolf <tw...@apache.org>
AuthorDate: Sun Jul 5 16:12:36 2026 +0200

    Fix ClientTest.closeCleanBeforeChannelOpened
    
    This test is questionable anyway; it opens a channel and then closes
    the session without waiting for the channel to be open. The OpenFuture
    of the channel might be in opened or canceled. So don't check the
    future; just check that the channel is not open after the session was
    closed.
---
 sshd-core/src/test/java/org/apache/sshd/client/ClientTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sshd-core/src/test/java/org/apache/sshd/client/ClientTest.java b/sshd-core/src/test/java/org/apache/sshd/client/ClientTest.java
index 496fe03a4..bea9abc5f 100644
--- a/sshd-core/src/test/java/org/apache/sshd/client/ClientTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/client/ClientTest.java
@@ -1027,7 +1027,7 @@ public class ClientTest extends BaseTestSupport {
             CloseFuture closeFuture = session.close(false);
             assertTrue(openFuture.await(DEFAULT_TIMEOUT), "Channel not open in time");
             assertTrue(closeFuture.await(DEFAULT_TIMEOUT), "Session closing not complete in time");
-            assertTrue(openFuture.isOpened(), "Not open");
+            assertFalse(channel.isOpen(), "Channel still open");
             assertTrue(closeFuture.isClosed(), "Not closed");
         } finally {
             client.stop();

(mina-sshd) 02/02: GH-906: Fix finding a signature factory for BC ed25519 keys

[tw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tomaswolf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git

commit 0da17757a0bd7f0574b1568b8e921066d5535bc5
Author: Thomas Wolf <tw...@apache.org>
AuthorDate: Sun Jul 5 16:16:03 2026 +0200

    GH-906: Fix finding a signature factory for BC ed25519 keys
    
    This is a backport of a fix done in 3.0.0-M1. Bouncy Castle ed25519
    keys return "Ed25519" from getAlgorithm() unless option
    org.bouncycastle.emulate.oracle=true is set.
---
 CHANGES.md                                                             | 1 +
 .../main/java/org/apache/sshd/common/signature/SignatureFactory.java   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 231c88e10..9986a6583 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -33,6 +33,7 @@
 
 ## Bug Fixes
 
+* [GH-906](https://github.com/apache/mina-sshd/issues/906) Fix finding a signature factory for BC ed25519 keys
 
 ## New Features
 
diff --git a/sshd-common/src/main/java/org/apache/sshd/common/signature/SignatureFactory.java b/sshd-common/src/main/java/org/apache/sshd/common/signature/SignatureFactory.java
index 6876856e5..e2a1bf681 100644
--- a/sshd-common/src/main/java/org/apache/sshd/common/signature/SignatureFactory.java
+++ b/sshd-common/src/main/java/org/apache/sshd/common/signature/SignatureFactory.java
@@ -236,7 +236,8 @@ public interface SignatureFactory extends BuiltinFactory<Signature> {
             } else if (algo.contains("rsa")) {
                 factory = BuiltinSignatures.fromFactoryName(algo);
             }
-        } else if (SecurityUtils.EDDSA.equalsIgnoreCase(pubKey.getAlgorithm())) {
+        } else if (SecurityUtils.EDDSA.equalsIgnoreCase(pubKey.getAlgorithm())
+                || SecurityUtils.ED25519.equalsIgnoreCase(pubKey.getAlgorithm())) {
             factory = BuiltinSignatures.ed25519;
         }