terrafrost
c5d9534ada
fix bad merge
2020-12-13 00:57:30 -06:00
terrafrost
c25dff2ef0
Merge branch '2.0-class-rename' into 3.0-class-rename
2020-12-12 22:26:03 -06:00
terrafrost
0676524dfd
Merge branch '1.0-class-rename' into 2.0-class-rename
2020-12-12 21:41:10 -06:00
terrafrost
e6abc61f45
rm adding of dupe classes (they break annotations)
2020-12-12 21:39:58 -06:00
terrafrost
e4bf7b111a
Merge branch '2.0' into 3.0
2020-12-12 19:22:36 -06:00
terrafrost
5701295017
Merge branch '1.0' into 2.0
2020-12-12 17:13:41 -06:00
terrafrost
266f16816a
enable unit tests for PHP 8 / PHPUnit 9
2020-12-12 15:11:04 -06:00
terrafrost
653dbd7f94
rename phpseclib/phpseclib to phpseclib/phpseclib3 for 3.0 branch
2019-11-21 19:38:03 -06:00
terrafrost
17e6938fba
updates to Exceptions
2018-12-31 09:55:32 -06:00
terrafrost
50f9e1a71a
Tests/AES: add unit test for encrypting without a key
2018-12-02 11:58:07 -06:00
Jakob Gahde
8e6948fdd2
Backport CFB8 support from master
2018-03-27 04:32:16 +02:00
terrafrost
2440be341d
Tests/AES: add test for ECB mode
2018-02-21 08:20:29 -06:00
Sokolovskyy Roman
966ee7f170
Long array() to short [] syntax
2017-11-27 09:30:14 +01:00
Takuya Sawada
18a5867e16
Tests/AES: add newly added 'cfb8' cipher mode of operation for unit test
2017-10-05 19:06:50 +09:00
terrafrost
4171262b9e
SymmetricKey: use strings for constructor and setPreferredEngine
2017-06-28 06:54:10 -05:00
terrafrost
d34a911402
SymmetricCiphers: don't cache "hi-optimized code"
...
Also add a new engine - ENGINE_EVAL. Previously ENGINE_INTERNAL
had three different modes - a "hi-optimized" version, a
"lo-optimized" version and a version that didn't depend on
create_function and there wasn't a way to really isolate these
modes and test them individually.
2016-12-08 09:20:19 -06:00
terrafrost
c509909004
Organizational Revamp
...
- rename \phpseclib\Crypt\Base to \phpseclib\Crypt\Common\SymmetricKey
- create BlockCipher and StreamCipher to extend SymmetricKey
- replace _string_shift with \phpseclib\Common\Functions\Strings::shift
2016-07-30 22:18:06 -05:00
terrafrost
398a795e1f
Revert "undo merging of master to 2.0 branch"
...
This reverts commit 8fb4c3363d
2016-04-30 16:23:35 -05:00
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 ef04c870e9cd57bf31ae
2016-04-10 11:25:31 -05:00
terrafrost
7558f097c0
Tests/AES: update newest unit test
2016-02-20 21:44:39 -06:00
terrafrost
ae1e5c13f9
Merge branch 'master' into cipher-revamp
2016-02-20 21:44:00 -06:00
terrafrost
1e50a102ac
Merge branch '2.0'
2016-02-20 14:16:06 -06:00
terrafrost
b566fcaeee
Tests/AES: Crypt_AES -> AES
2016-02-20 14:15:57 -06:00
terrafrost
82ab57e14c
Merge branch '2.0'
2016-02-19 15:19:30 -06:00
terrafrost
6d3c04ef4d
Merge branch '1.0' into 2.0
2016-02-19 15:19:20 -06:00
terrafrost
b972a4b36d
Tests/AES: add unit test for continuous mode
2016-02-05 23:29:20 -06:00
terrafrost
e74841477f
Crypt: become a lot less tolerant of bad parameters
2016-02-03 08:56:25 -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
604dddc82b
Merge branch 'getkeylength' into getkeylength-2.0-2
...
Conflicts:
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
2015-09-22 21:26:00 -05:00
terrafrost
bfba3db1a7
Crypt: make it so the key length can be explicitly set for all ciphers
2015-09-20 12:24:06 -05:00
Andreas Fischer
4387b64426
Merge branch '1.0' into 2.0
...
* 1.0:
Fixed another case
Minor tweaks
Fixed error
More fixes
PHPDoc fixes
Conflicts:
phpseclib/Crypt/Random.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
2015-09-14 01:27:04 +02:00
Graham Campbell
eec8c9cb5d
More fixes
2015-09-06 12:39:14 +01:00
terrafrost
d00e20a140
Merge remote-tracking branch 'graham/1.0-phpdoc' into 2.0-phpdoc
...
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Net/SCP.php
tests/Unit/File/ASN1Test.php
2015-04-16 00:42:53 -05:00
terrafrost
9f626c67b6
Merge remote-tracking branch 'graham/1.0-phpdoc' into 1.0-phpdoc
2015-04-16 00:31:54 -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
Graham Campbell
e50cbacd4e
Fixed some phpdocs
2015-03-29 17:07:17 +01:00
terrafrost
0f01128e98
Tests/AES: change CRYPT_AES_MODE_* -> CRYPT_MODE_*
2015-01-16 20:27:43 -06:00
terrafrost
f1b41e2782
Tests/AES: pack everything
2015-01-14 22:46:46 -06:00
terrafrost
7efc032d4b
Tests/AES: pass everything through bin2hex
...
(i thought this was already being done..)
2015-01-14 21:05:34 -06:00
terrafrost
cd57289555
Tests/AES: attempt to fix failing unit test
2015-01-14 20:19:03 -06:00
terrafrost
3485242ef6
Tests/AES: pack plaintext prior to encryption
2015-01-07 22:55:35 -06:00
terrafrost
8713e94001
Tests/AES: disable padding
2015-01-07 21:36:02 -06:00
terrafrost
e75d94663e
Tests/AES: use bin2hex for result comparison
2015-01-07 21:14:02 -06:00
terrafrost
4766973e61
Tests/AES: add official test vectors to test
2015-01-01 23:56:01 -06:00
terrafrost
dffde1fffc
Tests/AES: rm last two commits - this info can already be derived
2014-12-31 23:02:22 -06:00
terrafrost
289ef9a2b7
Tests/AES: improve error message for continuous buffer test as well
2014-12-31 22:46:16 -06:00
terrafrost
bb6689add3
Tests/AES: use better error message
2014-12-31 22:32:55 -06:00
terrafrost
50a0ae7b6e
Test/AES: don't test stuff with only one buffer
2014-12-31 15:15:15 -06:00
