Merge pull request #61 from norrisjeremy/20210812

Several updates

.github/workflows/maven.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 15]
+        java: [8, 11, 16]
     steps:
     - uses: actions/checkout@v2
     - name: Cache local Maven repository
@@ -29,7 +29,7 @@ jobs:
     - name: Set up build JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 15
+        java-version: 16
     - name: Build with Maven
       run: mvn -B -DskipTests=true package --file pom.xml
     - name: Set up test JDK ${{ matrix.java }}

LICENSE.JZlib.txt

@@ -0,0 +1,29 @@
+JZlib 0.0.* were released under the GNU LGPL license.  Later, we have switched 
+over to a BSD-style license. 
+
+------------------------------------------------------------------------------
+Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright 
+     notice, this list of conditions and the following disclaimer in 
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSE.OpenJAX.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 OpenJAX
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE.jBCrypt.txt

@@ -0,0 +1,18 @@
+jBCrypt is subject to the following license:
+
+/*
+ * Copyright (c) 2006 Damien Miller <djm@mindrot.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+

Readme.md

@@ -1,4 +1,4 @@
-# fork of JSch-0.1.55
+# Fork of JSch-0.1.55
 
 See original [README](README)
 
@@ -10,29 +10,76 @@ See original [README](README)
 ## Why should you use this library?
 
 As I explained in a [blog post](http://www.matez.de/index.php/2020/06/22/the-future-of-jsch-without-ssh-rsa/) the main points are:
-* OpenSSH will disable ssh-rsa in the future per default and you need a library which supports rsa-sha2-256 and rsa-sha2-512
-* drop in replacement: just change dependency coordinates and you are good to go
-* no active maintenance of [JSch at SourceForge](https://sourceforge.net/projects/jsch/)
-* stay in sync with JDK features so there is no need for additional dependencies
+* OpenSSH will disable ssh-rsa in the future per default and you need a library which supports rsa-sha2-256 and rsa-sha2-512.
+* Drop in replacement: just change dependency coordinates and you are good to go.
+* No active maintenance of [JSch at SourceForge](https://sourceforge.net/projects/jsch/).
+* Stay in sync with OpenJDK features so there is no need for additional dependencies.
 
 ## FAQ
 
-* Is this fork 100% compatible with original Jsch, because the connection to my server does not work any more
-  * for compatibility with openssh and security, the order of signure algorithms was changed. If you still want to use older or deprecated algorithms, you need to change the configuration. Examples see [#37](https://github.com/mwiede/jsch/issues/37), [#40](https://github.com/mwiede/jsch/issues/40)
-* Is ssh-ed25519 supported?
-  * This library is a Multi-Release-jar, which means, that you can only use certain features, when a more recent java version is used. In order to use ssh-ed25519, you must use at least Java 15
+* Is this fork 100% compatible with original JSch, because the connection to my server does not work any more!
+  * For compatibility with OpenSSH and improved security, the order of crypto algorithms was changed. If you still want to use older or deprecated algorithms, you need to change the configuration. Examples see [#37](https://github.com/mwiede/jsch/issues/37), [#40](https://github.com/mwiede/jsch/issues/40)
+  * To make it easier to adjust the crypto algorithms, starting with [0.1.65](https://github.com/mwiede/jsch/releases/tag/jsch-0.1.65) the following system properties can be set
+    at your application's startup:
+    * `jsch.kex`
+      * analogous to `JSch.setConfig("kex", "...")`
+    * `jsch.server_host_key`
+      * analogous to `JSch.setConfig("server_host_key", "...")`
+    * `jsch.cipher`
+      * analogous to `JSch.setConfig("cipher.s2c", "...")` + `JSch.setConfig("cipher.c2s", "...")`
+    * `jsch.mac`
+      * analogous to `JSch.setConfig("mac.s2c", "...")` + `JSch.setConfig("mac.c2s", "...")`
+    * `jsch.compression`
+      * analogous to `JSch.setConfig("compression.s2c", "...")` + `JSch.setConfig("compression.c2s", "...")`
+    * `jsch.lang`
+      * analogous to `JSch.setConfig("lang.s2c", "...")` + `JSch.setConfig("lang.c2s", "...")`
+    * `jsch.dhgex_min`
+      * analogous to `JSch.setConfig("dhgex_min", "...")`
+    * `jsch.dhgex_max`
+      * analogous to `JSch.setConfig("dhgex_max", "...")`
+    * `jsch.dhgex_preferred`
+      * analogous to `JSch.setConfig("dhgex_preferred", "...")`
+    * `jsch.compression_level`
+      * analogous to `JSch.setConfig("compression_level", "...")`
+    * `jsch.preferred_authentications`
+      * analogous to `JSch.setConfig("PreferredAuthentications", "...")`
+    * `jsch.client_pubkey`
+      * analogous to `JSch.setConfig("PubkeyAcceptedAlgorithms", "...")`
+    * `jsch.check_ciphers`
+      * analogous to `JSch.setConfig("CheckCiphers", "...")`
+    * `jsch.check_macs`
+      * analogous to `JSch.setConfig("CheckMacs", "...")`
+    * `jsch.check_kexes`
+      * analogous to `JSch.setConfig("CheckKexes", "...")`
+    * `jsch.check_signatures`
+      * analogous to `JSch.setConfig("CheckSignatures", "...")`
+    * `jsch.fingerprint_hash`
+      * analogous to `JSch.setConfig("FingerprintHash", "...")`
+    * `jsch.max_auth_tries`
+      * analogous to `JSch.setConfig("MaxAuthTries", "...")`
+* Are ssh-ed25519, ssh-ed448, curve25519-sha256, curve448-sha512 & chacha20-poly1305@<!-- -->openssh.com supported?
+  * This library is a Multi-Release-jar, which means that you can only use certain features when a more recent Java version is used.
+    * In order to use ssh-ed25519 & ssh-ed448, you must use at least Java 15.
+    * In order to use curve25519-sha256, curve448-sha512 & chacha20-poly1305@<!-- -->openssh.com, you must use at least Java 11.
 
 ## Changes since fork:
+* [0.1.65](https://github.com/mwiede/jsch/releases/tag/jsch-0.1.65)
+  * Added system properties to allow manipulation of various crypto algorithms used by default
+  * Integrated JZlib, allowing use of zlib@<!-- -->openssh.com & zlib compressions without the need to provide the JZlib jar-file
+  * Modularized the jar-file for use with Java 9 or newer
+  * Added runtime controls for the min/max/preferred sizes used for diffie-hellman-group-exchange-sha256 & diffie-hellman-group-exchange-sha1
+  * Renamed PubkeyAcceptedKeyTypes config to PubkeyAcceptedAlgorithms to match recent changes in OpenSSH (PubkeyAcceptedKeyTypes is still accepted for backward compatibility)
+  * Reduced number of algorithms that are runtime checked by default via CheckCiphers, CheckMacs, CheckKExes & CheckSignatures to improve runtime performance
 * [0.1.64](https://github.com/mwiede/jsch/releases/tag/jsch-0.1.64) Fixing [#55](https://github.com/mwiede/jsch/pull/55)
 * [0.1.63](https://github.com/mwiede/jsch/releases/tag/jsch-0.1.63) Fixing [#42](https://github.com/mwiede/jsch/issues/42)
 * [0.1.62](https://github.com/mwiede/jsch/releases/tag/jsch-0.1.62) bugfixes and code cleanup
-* 0.1.61
+* [0.1.61](https://github.com/mwiede/jsch/releases/tag/jsch-0.1.61)
   * Add support for chacha20-poly1305@<!-- -->openssh.com, ssh-ed25519, ssh-ed448, curve448-sha512, diffie-hellman-group15-sha512 & diffie-hellman-group17-sha512. This makes use of the new EdDSA feature added in [Java 15's JEP 339](https://openjdk.java.net/jeps/339). [#17](https://github.com/mwiede/jsch/pull/17)
   * added integration test for public key authentication [#19](https://github.com/mwiede/jsch/pull/19)
-* 0.1.60 
+* [0.1.60](https://github.com/mwiede/jsch/releases/tag/jsch-0.1.60)
   * support for openssh-v1-private-key format [opensshFormat.md](opensshFormat.md).
   * Fix bug with AEAD ciphers when compression is used. [#15](https://github.com/mwiede/jsch/pull/15)
-* 0.1.59 fixing issue from https://sourceforge.net/p/jsch/mailman/message/36872566/
-* 0.1.58 support for more algorithms contributed by [@norrisjeremy](https://github.com/norrisjeremy) see [#4](https://github.com/mwiede/jsch/pull/4)
-* 0.1.57 support for rsa-sha2-256 and rsa-sha2-512. [#1](https://github.com/mwiede/jsch/pull/1)
-* 0.1.56 support for direct-streamlocal@<!-- -->openssh.com (see [SocketForwardingL.java](examples/SocketForwardingL.java))
+* [0.1.59](https://github.com/mwiede/jsch/releases/tag/jsch-0.1.59) fixing issue from https://sourceforge.net/p/jsch/mailman/message/36872566/
+* [0.1.58](https://github.com/mwiede/jsch/releases/tag/jsch-0.1.58) support for more algorithms contributed by [@norrisjeremy](https://github.com/norrisjeremy) see [#4](https://github.com/mwiede/jsch/pull/4)
+* [0.1.57](https://github.com/mwiede/jsch/releases/tag/jsch-0.1.57) support for rsa-sha2-256 and rsa-sha2-512. [#1](https://github.com/mwiede/jsch/pull/1)
+* [0.1.56](https://github.com/mwiede/jsch/releases/tag/jsch-0.1.56) support for direct-streamlocal@<!-- -->openssh.com (see [SocketForwardingL.java](examples/SocketForwardingL.java))