Merge branch 'main' into dev

ChangeLog.md

@@ -139,6 +139,11 @@ NullPointerException if a cipher algorithm supported by the SSH server but not
 by the SSH client was specified using the `Ciphers` OpenSSH config file
 keyword.
 
+9. Fixed an issue in the TurboVNC Viewer's built-in SSH client whereby the SSH
+connection timeout specified using the `ConnectTimeout` OpenSSH config file
+keyword was interpreted as milliseconds rather than seconds.  This caused the
+SSH connection to fail if the timeout was too low.
+
 
 3.1.3
 =====

java/com/jcraft/jsch/OpenSSHConfig.java

@@ -1,7 +1,7 @@
 /* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */
 /*
 Copyright (c) 2013-2018 ymnk, JCraft,Inc. All rights reserved.
-Copyright (c) 2019, 2023 D. R. Commander. All rights reserved.
+Copyright (c) 2019, 2023, 2025 D. R. Commander. All rights reserved.
 Copyright (c) 2020-2021 Jeremy Norris. All rights reserved.
 Copyright (c) 2021 Matthias Wiedemann. All rights reserved.
 
@@ -157,6 +157,19 @@ else if(key_value[0].equalsIgnoreCase("ServerAliveInterval")){
         }
         kv.addElement(key_value);
       }
+      else if(key_value[0].equalsIgnoreCase("ConnectTimeout")){
+        int connectTimeout = -1;
+        try {
+          connectTimeout = Integer.parseInt(key_value[1]);
+        }
+        catch(NumberFormatException e){
+          // wrong format
+        }
+        if(connectTimeout>=0){
+          key_value[1]=Integer.toString(connectTimeout*1000);
+        }
+        kv.addElement(key_value);
+      }
       else {
         kv.addElement(key_value);
       }