octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-26 03:27:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0' into 2.0

Browse Source
This commit is contained in:
terrafrost 2022-09-13 23:59:59 -05:00
commit 73b149ea6d
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpseclib/Crypt/Random.php
View File

@ -151,7 +151,10 @@ class Random
(isset($_POST) ? phpseclib_safe_serialize($_POST) : '') . (isset($_POST) ? phpseclib_safe_serialize($_POST) : '') .
(isset($_GET) ? phpseclib_safe_serialize($_GET) : '') . (isset($_GET) ? phpseclib_safe_serialize($_GET) : '') .
(isset($_COOKIE) ? phpseclib_safe_serialize($_COOKIE) : '') . (isset($_COOKIE) ? phpseclib_safe_serialize($_COOKIE) : '') .
phpseclib_safe_serialize($GLOBALS) . // as of PHP 8.1 $GLOBALS cann't be accessed by reference, which eliminates
// the need for phpseclib_safe_serialize. see https://wiki.php.net/rfc/restrict_globals_usage
// for more info
(version_compare(PHP_VERSION, '8.1.0', '>=') ? serialize($GLOBALS) : phpseclib_safe_serialize($GLOBALS)) .
phpseclib_safe_serialize($_SESSION) . phpseclib_safe_serialize($_SESSION) .
phpseclib_safe_serialize($_OLD_SESSION) phpseclib_safe_serialize($_OLD_SESSION)
)); ));

2
phpseclib/Math/BigInteger.php
View File

@ -372,7 +372,7 @@ class BigInteger
break; break;
case self::MODE_BCMATH: case self::MODE_BCMATH:
// round $len to the nearest 4 (thanks, DavidMJ!) // round $len to the nearest 4 (thanks, DavidMJ!)
$len = (strlen($x) + 3) & 0xFFFFFFFC; $len = (strlen($x) + 3) & ~3;
$x = str_pad($x, $len, chr(0), STR_PAD_LEFT); $x = str_pad($x, $len, chr(0), STR_PAD_LEFT);

2
phpseclib/Net/SFTP.php
View File

@ -422,7 +422,7 @@ class SFTP extends SSH2
// yields inconsistent behavior depending on how php is compiled. so we left shift -1 (which, in // yields inconsistent behavior depending on how php is compiled. so we left shift -1 (which, in
// two's compliment, consists of all 1 bits) by 31. on 64-bit systems this'll yield 0xFFFFFFFF80000000. // two's compliment, consists of all 1 bits) by 31. on 64-bit systems this'll yield 0xFFFFFFFF80000000.
// that's not a problem, however, and 'anded' and a 32-bit number, as all the leading 1 bits are ignored. // that's not a problem, however, and 'anded' and a 32-bit number, as all the leading 1 bits are ignored.
(-1 << 31) & 0xFFFFFFFF => 'NET_SFTP_ATTR_EXTENDED' (PHP_INT_SIZE == 4 ? -1 : 0xFFFFFFFF) => 'NET_SFTP_ATTR_EXTENDED'
); );
$this->open_flags = array( $this->open_flags = array(
0x00000001 => 'NET_SFTP_OPEN_READ', 0x00000001 => 'NET_SFTP_OPEN_READ',