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

Blowfish: fix bad merge

Browse Source
This commit is contained in:
terrafrost 2024-05-22 08:33:08 -05:00
parent 624a91e94e
commit 0aae9c724d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpseclib/Crypt/Blowfish.php
View File

@ -412,7 +412,7 @@ class Blowfish extends BlockCipher
$this->bctx['p'][$i ] = $l; $this->bctx['p'][$i ] = $l;
$this->bctx['p'][$i + 1] = $r; $this->bctx['p'][$i + 1] = $r;
} }
for ($i = 0; $i < 0x400; $i+= 0x100) { for ($i = 0; $i < 0x400; $i += 0x100) {
for ($j = 0; $j < 256; $j += 2) { for ($j = 0; $j < 256; $j += 2) {
[$l, $r] = array_values(unpack('N*', $data = $this->encryptBlock($data))); [$l, $r] = array_values(unpack('N*', $data = $this->encryptBlock($data)));
$this->bctx['sb'][$i | $j] = $l; $this->bctx['sb'][$i | $j] = $l;
@ -504,7 +504,7 @@ class Blowfish extends BlockCipher
* @param int[] $p * @param int[] $p
* @see self::_bcrypt_hash() * @see self::_bcrypt_hash()
*/ */
private static function expand0state(array $key, array &$sbox0, array &$sbox, array &$p): void private static function expand0state(array $key, array &$sbox, array &$p): void
{ {
// expand0state is basically the same thing as this: // expand0state is basically the same thing as this:
//return self::expandstate(array_fill(0, 16, 0), $key); //return self::expandstate(array_fill(0, 16, 0), $key);