Skip to content

Commit

Permalink
Merge branch '3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
terrafrost committed Nov 22, 2024
2 parents 7aa66fd + e81fd68 commit f388cb1
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions phpseclib/Net/SSH2.php
Original file line number Diff line number Diff line change
Expand Up @@ -953,16 +953,6 @@ class SSH2
*/
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
*
Expand All @@ -977,7 +967,7 @@ class SSH2
*
* @var int
*/
private $doKeyReexchangeAfterXBytes = 256 * 1024;
private $doKeyReexchangeAfterXBytes = 1024 * 1024 * 1024;

/**
* Has a key re-exchange been initialized?
Expand Down

0 comments on commit f388cb1

Please sign in to comment.