Merge branch '3.0'

This commit is contained in:
terrafrost 2024-11-22 17:14:18 -06:00
commit f388cb1d84

View File

@ -953,16 +953,6 @@ class SSH2
*/ */
private $errorOnMultipleChannels; private $errorOnMultipleChannels;
/**
* Terrapin Countermeasure
*
* "During initial KEX, terminate the connection if any unexpected or out-of-sequence packet is received"
* -- https://github.com/openssh/openssh-portable/commit/1edb00c58f8a6875fad6a497aa2bacf37f9e6cd5
*
* @var int
*/
private $extra_packets;
/** /**
* Bytes Transferred Since Last Key Exchange * Bytes Transferred Since Last Key Exchange
* *
@ -977,7 +967,7 @@ class SSH2
* *
* @var int * @var int
*/ */
private $doKeyReexchangeAfterXBytes = 256 * 1024; private $doKeyReexchangeAfterXBytes = 1024 * 1024 * 1024;
/** /**
* Has a key re-exchange been initialized? * Has a key re-exchange been initialized?