terrafrost
|
8fb4c3363d
|
undo merging of master to 2.0 branch
|
2016-04-28 15:34:10 -05:00 |
|
terrafrost
|
b4cf10fc94
|
Revert "Merge branch '2.0'"
This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing
changes made to 638fe6971c.
|
2016-04-10 11:30:59 -05:00 |
|
terrafrost
|
4b69dcb1ca
|
Revert "Merge remote-tracking branch 'bantu/bootstrap'"
This reverts commit ef04c870e9, reversing
changes made to cd57bf31ae.
|
2016-04-10 11:25:31 -05:00 |
|
terrafrost
|
73a4221988
|
Crypt: become a lot less tolerant of bad parameters
|
2016-01-31 12:37:38 -06:00 |
|
terrafrost
|
d5a868ed4f
|
Crypt/Base: throw an exception if an IV is required but not defined
|
2016-01-17 11:48:07 -06:00 |
|
terrafrost
|
188cef4665
|
Tests/DES: method is testing decryption - not encryption
|
2015-04-02 22:20:02 -05:00 |
|
terrafrost
|
ebcb3130b7
|
Merge branch 'openssl-support' into 2.0
Conflicts:
phpseclib/Crypt/AES.php
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/RC2.php
phpseclib/Crypt/RC4.php
phpseclib/Crypt/Rijndael.php
phpseclib/Crypt/TripleDES.php
phpseclib/Crypt/Twofish.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPLargeFileTest.php
tests/Unit/Crypt/AES/InternalTest.php
tests/Unit/Crypt/AES/McryptTest.php
tests/Unit/Crypt/AES/TestCase.php
|
2015-04-02 05:32:31 -05:00 |
|
terrafrost
|
09c03d0f75
|
Tests/DES: the expeted output of testDecryptPadding() was incorrect
(the expected output can be obtained by setting the key and iv both to 'd')
|
2014-12-28 23:15:45 -06:00 |
|
terrafrost
|
45a5c05da6
|
Tests: rename tests so that they actually run
|
2014-12-21 09:54:44 -06:00 |
|