octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-16 02:07:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "..."

Browse Source 
This reverts commit 827607575a.
This commit is contained in:
terrafrost 2020-07-08 08:48:48 -05:00
parent 6e4f6dab1b
commit e2fa9f3925
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpseclib/Net/SSH2.php
View File

@ -3873,7 +3873,6 @@ class SSH2
switch ($this->encrypt->name) { switch ($this->encrypt->name) {
case 'aes128-gcm@openssh.com': case 'aes128-gcm@openssh.com':
case 'aes256-gcm@openssh.com': case 'aes256-gcm@openssh.com':
$startEncrypt = microtime(true);
$this->encrypt->setNonce( $this->encrypt->setNonce(
$this->encrypt->fixed . $this->encrypt->fixed .
$this->encrypt->invocation_counter $this->encrypt->invocation_counter
@ -3881,7 +3880,6 @@ $startEncrypt = microtime(true);
Strings::increment_str($this->encrypt->invocation_counter); Strings::increment_str($this->encrypt->invocation_counter);
$this->encrypt->setAAD($temp = ($packet & "\xFF\xFF\xFF\xFF")); $this->encrypt->setAAD($temp = ($packet & "\xFF\xFF\xFF\xFF"));
$packet = $temp . $this->encrypt->encrypt(substr($packet, 4)); $packet = $temp . $this->encrypt->encrypt(substr($packet, 4));
$encryptTime = microtime(true) - $startEncrypt;
break; break;
case 'chacha20-poly1305@openssh.com': case 'chacha20-poly1305@openssh.com':
$nonce = pack('N2', 0, $this->send_seq_no); $nonce = pack('N2', 0, $this->send_seq_no);
@ -3930,7 +3928,7 @@ $encryptTime = microtime(true) - $startEncrypt;
$current = microtime(true); $current = microtime(true);
$message_number = isset($this->message_numbers[ord($data[0])]) ? $this->message_numbers[ord($data[0])] : 'UNKNOWN (' . ord($data[0]) . ')'; $message_number = isset($this->message_numbers[ord($data[0])]) ? $this->message_numbers[ord($data[0])] : 'UNKNOWN (' . ord($data[0]) . ')';
$message_number = '-> ' . $message_number . $message_number = '-> ' . $message_number .
' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's, encrypt time: ' . round($encryptTime, 4) . ')'; ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)';
$this->append_log($message_number, isset($logged) ? $logged : $data); $this->append_log($message_number, isset($logged) ? $logged : $data);
$this->last_packet = $current; $this->last_packet = $current;
} }