Merge branch 'master' into 3.0.0

Author: tomaswolf

docs/dependencies.md

@@ -5,7 +5,9 @@
 Required mainly for writing keys to PEM files or for special keys/ciphers/etc. that are not part of the standard
 [Java Cryptography Extension](https://en.wikipedia.org/wiki/Java_Cryptography_Extension). See
 [Java Cryptography Architecture (JCA) Reference Guide](https://docs.oracle.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec.html)
-for key classes and explanations as to how _Bouncy Castle_ is plugged in (other security providers).
+for key classes and explanations as to how _Bouncy Castle_ is plugged in (other security providers). 
+Also necessary for [certain algorithms](./standards.md#implementedavailable-support) that are supported only
+if Bouncy Castle is present.
 
 **Caveat**: If _Bouncy Castle_ modules are registered, then the code will use its implementation of the ciphers,
 keys, signatures, etc. rather than the default JCE provided in the JVM.

sshd-common/src/main/java/org/apache/sshd/common/config/keys/OpenSshCertificate.java

@@ -25,7 +25,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.SortedMap;
-import java.util.concurrent.TimeUnit;
 
 import org.apache.sshd.common.NamedFactory;
 import org.apache.sshd.common.signature.Signature;
@@ -210,8 +209,7 @@ public static Type fromCode(int code) {
      * @return      {@code true} if the certificate is valid according to its timestamps, {@code false} otherwise
      */
     static boolean isValidNow(OpenSshCertificate cert) {
-        long now = TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis());
-        return Long.compareUnsigned(cert.getValidAfter(), now) <= 0 && Long.compareUnsigned(now, cert.getValidBefore()) < 0;
+        return isValidAt(cert, Instant.now());
     }
 
     /**

sshd-contrib/pom.xml

@@ -98,7 +98,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.27.4</version>
+            <version>3.27.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

sshd-sftp/src/test/java/org/apache/sshd/sftp/client/SftpTransferTest.java

@@ -29,16 +29,23 @@
 import java.util.List;
 
 import org.apache.sshd.client.session.ClientSession;
+import org.apache.sshd.common.session.Session;
+import org.apache.sshd.common.session.SessionListener;
 import org.apache.sshd.core.CoreModuleProperties;
 import org.apache.sshd.sftp.client.fs.SftpFileSystem;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.MethodOrderer.MethodName;
 import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @TestMethodOrder(MethodName.class)
 class SftpTransferTest extends AbstractSftpClientTestSupport {
 
+    private static final Logger LOG = LoggerFactory.getLogger(SftpTransferTest.class);
+
     private static final int BUFFER_SIZE = 8192;
 
     static List<Long> getParameters() {
@@ -48,6 +55,16 @@ static List<Long> getParameters() {
         return params;
     }
 
+    @BeforeAll
+    static void logExceptions() {
+        sshd.addSessionListener(new SessionListener() {
+            @Override
+            public void sessionException(Session session, Throwable t) {
+                LOG.warn("**** Session {} caught exception", session, t);
+            }
+        });
+    }
+
     @MethodSource("getParameters")
     @ParameterizedTest(name = "REKEY_BLOCK_SIZE {0}")
     void transferIntegrity(long rekeyBlockSize) throws IOException {