Merge branch '2.0' into 3.0

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 2.0.30 - 2020-12-16
+
+- X509: don't attempt to parse multi-cert PEMs (#1542)
+- SFTP: add stream to get method (#1546)
+- SFTP: progress callback should report actual downloaded bytes (#1543)
+- SSH2: end connection faster for algorithm mismatch
+- SSH2: add setKeepAlive() method (#1529)
+- ANSI: fix PHP8 compatibility issues
+
 ## 2.0.29 - 2020-09-07
 
 - SFTP: add enableDatePreservation() / disableDatePreservation() (#1496)

README.md

@@ -10,16 +10,16 @@
 
 ## Introduction
 
-MIT-licensed pure-PHP implementations of an arbitrary-precision integer
-arithmetic library, fully PKCS#1 (v2.1) compliant RSA, DES, 3DES, RC4, Rijndael,
-AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509
+MIT-licensed pure-PHP implementations of the following:
+
+SSH-2, SFTP, X.509, an arbitrary-precision integer arithmetic library, Ed25519 / Ed449 / Curve25519 / Curve449, ECDSA / ECDH (with support for 66 curves), RSA (PKCS#1 v2.2 compliant), DSA / DH, DES / 3DES / RC4 / Rijndael / AES / Blowfish / Twofish / Salsa20 / ChaCha20, GCM / Poly1305
 
 * [Browse Git](https://github.com/phpseclib/phpseclib)
 
 ## Documentation
 
-* [Documentation / Manual](http://phpseclib.sourceforge.net/)
-* [API Documentation](https://api.phpseclib.org/3.0/) (generated by Doctum)
+* [Documentation / Manual](https://phpseclib.com/)
+* [API Documentation](https://api.phpseclib.com/3.0/) (generated by Doctum)
 
 ## Branches
 
@@ -29,6 +29,14 @@ AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509
 * Unstable API
 * Do not use in production
 
+### 3.0
+
+* Long term support (LTS) release
+* Major expansion of cryptographic primitives
+* Minimum PHP version: 5.6.1
+* PSR-4 autoloading with namespace rooted at `\phpseclib3`
+* Install via Composer: `composer require phpseclib/phpseclib:~3.0`
+
 ### 2.0
 
 * Long term support (LTS) release