diff --git a/CHANGELOG.md b/CHANGELOG.md index 74f24d9d..50bd59f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## 2.0.14 - 2019-01-27 + +- SSH2: ssh-rsa is sometimes incorrectly used instead of rsa-sha2-256 (#1331) +- SSH2: more strictly adhere to RFC8332 for rsa-sha2-256/512 (#1332) + +## 2.0.13 - 2018-12-16 + +- SSH2: fix order of user_error() / bitmap reset (#1314) +- SSH2: setTimeout(0) didn't work as intended (#1116) +- Agent: add support for rsa-sha2-256 / rsa-sha2-512 (#1319) +- Agent: add parameter to constructor (#1319) +- X509: fix errors with validateDate (#1318) + ## 2.0.12 - 2018-11-04 - SSH2: fixes relating to delayed global requests (#1271) @@ -126,6 +139,18 @@ - Classes were renamed and namespaced ([#243](https://github.com/phpseclib/phpseclib/issues/243)) - The use of an autoloader is now required (e.g. Composer) +## 1.0.14 - 2019-01-27 + +- SSH2: ssh-rsa is sometimes incorrectly used instead of rsa-sha2-256 (#1331) +- SSH2: more strictly adhere to RFC8332 for rsa-sha2-256/512 (#1332) + +## 1.0.13 - 2018-12-16 + +- SSH2: fix order of user_error() / bitmap reset (#1314) +- SSH2: setTimeout(0) didn't work as intended (#1116) +- Agent: add support for rsa-sha2-256 / rsa-sha2-512 (#1319) +- Agent: add parameter to constructor (#1319) + ## 1.0.12 - 2018-11-04 - SSH2: fixes relating to delayed global requests (#1271) diff --git a/README.md b/README.md index e83cd863..fb01b321 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509 * Composer compatible (PSR-0 autoloading) * Install using Composer: `composer require phpseclib/phpseclib:~1.0` * Install using PEAR: See [phpseclib PEAR Channel Documentation](http://phpseclib.sourceforge.net/pear.htm) -* [Download 1.0.12 as ZIP](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.12.zip/download) +* [Download 1.0.14 as ZIP](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.14.zip/download) ## Support diff --git a/phpseclib/File/X509.php b/phpseclib/File/X509.php index fe0e32a6..1c031f2b 100644 --- a/phpseclib/File/X509.php +++ b/phpseclib/File/X509.php @@ -906,6 +906,9 @@ class X509 // "Certificate Transparency" // https://tools.ietf.org/html/rfc6962 case '1.3.6.1.4.1.11129.2.4.2': + // "Qualified Certificate statements" + // https://tools.ietf.org/html/rfc3739#section-3.2.6 + case '1.3.6.1.5.5.7.1.3': return true; // CSR attributes diff --git a/phpseclib/Net/SCP.php b/phpseclib/Net/SCP.php index 2d7f8166..0c2f88e4 100644 --- a/phpseclib/Net/SCP.php +++ b/phpseclib/Net/SCP.php @@ -148,6 +148,11 @@ class SCP return false; } + if (empty($remote_file)) { + user_error('remote_file cannot be blank', E_USER_NOTICE); + return false; + } + if (!$this->ssh->exec('scp -t ' . escapeshellarg($remote_file), false)) { // -t = to return false; }