Merge pull request #605 from norrisjeremy/20240723

0.2.19 changes

.sdkmanrc

@@ -1,4 +1,4 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=21.0.3-tem
+java=21.0.4-tem
 maven=3.9.8

ChangeLog.md

@@ -1,9 +1,10 @@
 * [0.2.19](https://github.com/mwiede/jsch/releases/tag/jsch-0.2.19)
-   * Enforce DHGEX prime modulus bit length meets configured constraints.
+  * Enforce DHGEX prime modulus bit length meets configured constraints.
+  * #604 Fix possible rekeying timeouts.
 * [0.2.18](https://github.com/mwiede/jsch/releases/tag/jsch-0.2.18)
-   * Handle negated patterns according to ssh_config(5) by @bmiddaugh in https://github.com/mwiede/jsch/pull/565
+  * Handle negated patterns according to ssh_config(5) by @bmiddaugh in https://github.com/mwiede/jsch/pull/565
 * [0.2.17](https://github.com/mwiede/jsch/releases/tag/jsch-0.2.17)
-   * Add PBKDF2-HMAC-SHA512/256 & PBKDF2-HMAC-SHA512/224, which are both supported as of Java 21.
+  * Add PBKDF2-HMAC-SHA512/256 & PBKDF2-HMAC-SHA512/224, which are both supported as of Java 21.
 * [0.2.16](https://github.com/mwiede/jsch/releases/tag/jsch-0.2.16)
   * Add support for sntrup761x25519-sha512@openssh.com KEX algorithm.
   * Switch to bnd-maven-plugin in order to support Multi-Release OSGi bundle JAR's via supplemental manifest files.

src/main/java/com/jcraft/jsch/Session.java

@@ -159,7 +159,7 @@ public class Session {
 
   protected boolean daemon_thread = false;
 
-  private long kex_start_time = 0L;
+  private volatile long kex_start_time = 0L;
 
   int max_auth_tries = 6;
   int auth_failures = 0;
@@ -843,8 +843,8 @@ private void send_kexinit() throws Exception {
       }
     }
 
-    in_kex = true;
     kex_start_time = System.currentTimeMillis();
+    in_kex = true;
 
     // byte SSH_MSG_KEXINIT(20)
     // byte[16] cookie (random bytes)