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

Fixed #632 Fatal error: Cannot access self:: when no class scope is active

Browse Source
This commit is contained in:
Matej Kravjar 2017-06-20 12:40:49 +02:00
parent 3cbb9516ef
commit 47c419545a
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpseclib/Crypt/DES.php
View File

@ -1357,8 +1357,8 @@ class DES extends Base
$k[self::ENCRYPT][$i] = '$ke[' . $i . ']';
$k[self::DECRYPT][$i] = '$kd[' . $i . ']';
}
$init_encrypt = '$ke = $self->keys[self::ENCRYPT];';
$init_decrypt = '$kd = $self->keys[self::DECRYPT];';
$init_encrypt = '$ke = $self->keys[$self::ENCRYPT];';
$init_decrypt = '$kd = $self->keys[$self::DECRYPT];';
break;
}

11
tests/Unit/Crypt/TripleDESTest.php
View File

@ -186,4 +186,15 @@ class Unit_Crypt_TripleDESTest extends PhpseclibTestCase
$this->assertEquals($result, $expected, "Failed asserting inner chainin worked correctly in $engineName engine");
}
}
// test special case lambda function error
public function testCorrectSelfUseInLambda()
{
$td = new TripleDES( TripleDES::MODE_ECB );
$td->setPreferredEngine( TripleDES::ENGINE_INTERNAL );
for ( $i = 0; $i < 20; $i++ ) {
$td->setKey( str_repeat( 'a', 20 ) . pack( 'V', mt_rand() ) );
$td->encrypt( str_repeat( 'a', 32 ) );
}
}
}