From 827607575ad6105f1535e3fd0e15fe5b557e612d Mon Sep 17 00:00:00 2001 From: terrafrost Date: Fri, 3 Jul 2020 13:31:37 -0500 Subject: [PATCH 1/2] ... --- phpseclib/Net/SSH2.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php index b518cca1..377e15c9 100644 --- a/phpseclib/Net/SSH2.php +++ b/phpseclib/Net/SSH2.php @@ -3873,6 +3873,7 @@ class SSH2 switch ($this->encrypt->name) { case 'aes128-gcm@openssh.com': case 'aes256-gcm@openssh.com': +$startEncrypt = microtime(true); $this->encrypt->setNonce( $this->encrypt->fixed . $this->encrypt->invocation_counter @@ -3880,6 +3881,7 @@ class SSH2 Strings::increment_str($this->encrypt->invocation_counter); $this->encrypt->setAAD($temp = ($packet & "\xFF\xFF\xFF\xFF")); $packet = $temp . $this->encrypt->encrypt(substr($packet, 4)); +$encryptTime = microtime(true) - $startEncrypt; break; case 'chacha20-poly1305@openssh.com': $nonce = pack('N2', 0, $this->send_seq_no); @@ -3928,7 +3930,7 @@ class SSH2 $current = microtime(true); $message_number = isset($this->message_numbers[ord($data[0])]) ? $this->message_numbers[ord($data[0])] : 'UNKNOWN (' . ord($data[0]) . ')'; $message_number = '-> ' . $message_number . - ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)'; + ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's, encrypt time: ' . round($encryptTime, 4) . ')'; $this->append_log($message_number, isset($logged) ? $logged : $data); $this->last_packet = $current; } From 6537e74746c09cde3bb94317ae039bd89e1decf9 Mon Sep 17 00:00:00 2001 From: terrafrost Date: Tue, 7 Jul 2020 23:31:58 -0500 Subject: [PATCH 2/2] 1.0.19 release --- CHANGELOG.md | 14 ++++++++++++++ README.md | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14b0c9ec..0aab9068 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## 1.0.19 - 2020-07-07 + +- SSH2: arcfour128 / arcfour256 were being included twice +- SSH2: make window resizing behave more consistently with PuTTY (#1421) +- SSH2: logging enhancements +- SSH2: try logging in with none as an auth method first (#1454) +- SFTP: change the mode with a SETSTAT instead of MKDIR (#1463) +- SFTP: make it so extending SFTP class doesn't cause a segfault (#1465) +- SFTP: realpath('') produced an error (#1474) +- SFTP: if /path/to/file is a file then /path/to/file/whatever errors (#1475) +- RSA: make PSS verification work for key length that aren't a power of 2 (#1423) +- ASN1: fix for malformed ASN1 strings (#1456) +- ANSI: fix "Number of elements can't be negative" error + ## 1.0.18 - 2019-09-16 - SSH2: fix regression for connecting to servers with bad hostnames (#1405) diff --git a/README.md b/README.md index 2853eace..0001e8a3 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,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.18 as ZIP](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.18.zip/download) +* [Download 1.0.19 as ZIP](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.19.zip/download) ## Security contact information