octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-28 12:10:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bad merge

Browse Source
This commit is contained in:
terrafrost 2022-07-30 18:11:00 -05:00
parent 450a961785
commit 1e10a6ab7a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpseclib/Crypt/Blowfish.php
View File

@ -59,7 +59,7 @@
* *
* This explains 3 of the 4 _encryptBlock() implementations. the last _encryptBlock() * This explains 3 of the 4 _encryptBlock() implementations. the last _encryptBlock()
* implementation can best be understood by doing Ctrl + F and searching for where * implementation can best be understood by doing Ctrl + F and searching for where
* CRYPT_BASE_USE_SAFE_INTVAL is defined. * self::$use_reg_intval is defined.
* *
* # phpseclib's three different _setupKey() implementations * # phpseclib's three different _setupKey() implementations
* *
@ -710,7 +710,7 @@ class Blowfish extends BlockCipher
$l = $in[1]; $l = $in[1];
$r = $in[2]; $r = $in[2];
list($r, $l) = CRYPT_BASE_USE_SAFE_INTVAL ? list($r, $l) = self::$use_reg_intval ?
self::encryptBlockHelperFast($l, $r, $sb_0, $sb_1, $sb_2, $sb_3, $p) : self::encryptBlockHelperFast($l, $r, $sb_0, $sb_1, $sb_2, $sb_3, $p) :
self::encryptBlockHelperSlow($l, $r, $sb_0, $sb_1, $sb_2, $sb_3, $p); self::encryptBlockHelperSlow($l, $r, $sb_0, $sb_1, $sb_2, $sb_3, $p);

2
phpseclib/Crypt/Common/SymmetricKey.php
View File

@ -3207,7 +3207,7 @@ abstract class SymmetricKey
*/ */
protected static function safe_intval($x) protected static function safe_intval($x)
{ {
if ($use_reg_intval || is_int($x)) { if (self::$use_reg_intval || is_int($x)) {
return $x; return $x;
} }
return (fmod($x, 0x80000000) & 0x7FFFFFFF) | return (fmod($x, 0x80000000) & 0x7FFFFFFF) |

2
tests/Unit/Crypt/RSA/LoadKeyTest.php
View File

@ -1274,7 +1274,7 @@ LrIZULwMa4nI4Y+RkFftEponSYw=
-----END OPENSSH PRIVATE KEY----- -----END OPENSSH PRIVATE KEY-----
'; ';
$key = PublicKeyLoader($key, 'test'); $key = PublicKeyLoader::load($key, 'test');
$this->assertInstanceOf(PrivateKey::class, $key); $this->assertInstanceOf(PrivateKey::class, $key);
} }
} }