terrafrost
e74841477f
Crypt: become a lot less tolerant of bad parameters
2016-02-03 08:56:25 -06:00
terrafrost
73a4221988
Crypt: become a lot less tolerant of bad parameters
2016-01-31 12:37:38 -06:00
terrafrost
977a4ebeaa
Merge pull request #925 from terrafrost/rsa-revamp-part-3
...
RSA: error out when encrypting strings that are too long
2016-01-21 10:20:53 -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
5d85d5eca1
RSA: error out when encrypting strings that are too long
2016-01-17 09:45:13 -06:00
terrafrost
806249c7e9
RSA: changes to how encryption / signatures work
2015-12-25 11:28:24 -06:00
Andreas Fischer
3793f34876
Merge branch '2.0'
...
* 2.0:
RSA: fix issue with loading PKCS8 specific keys
Tests/RSA: add unit test for loading PKCS8 specific keys
2015-11-10 10:13:32 +01:00
terrafrost
c34be16c3a
Merge branch 'rsa-pkcs8-fix' into rsa-pkcs8-fix-2.0
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-11-09 23:10:21 -06:00
terrafrost
e8d75b2e8d
Tests/RSA: add unit test for loading PKCS8 specific keys
2015-11-09 22:10:08 -06:00
terrafrost
43165d976c
RSA: changes to OpenSSH and PuTTY plugins
2015-10-24 15:54:34 -05:00
terrafrost
7b1b7c22e2
RSA: throw an exception if the modulo is too small
2015-10-23 13:45:35 -05:00
terrafrost
1522e6606b
RSA: add getSupportedFormats() and getLoadedFormat()
2015-10-22 10:57:05 -05:00
terrafrost
e2fcd9d951
RSA: misc fixes to select plugins
2015-10-21 21:24:12 -05:00
terrafrost
6eb5ea3ef7
RSA: add support for the microsoft BLOB key format
2015-10-20 23:17:11 -05:00
terrafrost
ad55d3cd75
RSA: fixes to last non-merge commit
2015-10-16 14:04:17 -05:00
terrafrost
31c14063fa
RSA: updates to raw plugin
2015-10-16 09:36:49 -05:00
terrafrost
cfcf554531
RSA: changes to putty plugin and rm comment methods from rsa etc
2015-10-01 23:11:55 -05:00
terrafrost
fb22529c44
Tests/RSA: add unit test for new functionality
2015-10-01 20:11:11 -05:00
terrafrost
91887c957d
Merge remote-tracking branch 'upstream/master' into rsa-plugins
...
Conflicts:
phpseclib/Crypt/RSA.php
phpseclib/Net/SSH2.php
2015-10-01 15:57:31 -05:00
terrafrost
ec3fe7277b
RSA: move key format handling to plugins
2015-10-01 15:41:11 -05:00
terrafrost
fab5a66fe5
RSA: make createKey static and make it return RSA objects
2015-09-24 09:43:19 -05: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
3b33941d3d
Merge pull request #813 from bantu/hash-rewrite
...
[master] More work on Hash.php
* bantu/hash-rewrite:
Hash: Cover remaining uncovered line.
Hash: Update incorrect documentation, use max line length 80.
Hash: Remove constructor return value documentation.
Hash: Do not assign false to length property. It's documented as an int.
Hash: Rename properly l to length.
Slightly rework of HashTest.php.
2015-09-14 22:47:37 +02:00
Andreas Fischer
5b6642ae37
Hash: Cover remaining uncovered line.
2015-09-14 01:34:20 +02:00
Andreas Fischer
3342eb6d09
Merge branch '2.0'
...
* 2.0:
Fixed another case
Minor tweaks
Fixed error
More fixes
PHPDoc fixes
2015-09-14 01:27:11 +02: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
Andreas Fischer
06a4cc5eba
Slightly rework of HashTest.php.
2015-09-07 19:32:58 +02:00
terrafrost
57d5081948
Tests/Hash: tiger is buggy in PHP 5.3
2015-09-06 09:16:18 -05:00
terrafrost
d76ae873ac
Hash: rm internal and mhash implementations (5.3 has hash built in)
2015-09-06 07:55:33 -05:00
Graham Campbell
eec8c9cb5d
More fixes
2015-09-06 12:39:14 +01:00
Andreas Fischer
54a1aeeefe
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/RSA: add PSS test
RSA: fix regression for PSS signatures
2015-08-13 14:37:15 -04:00
terrafrost
f591962fc4
Tests/RSA: add PSS test
2015-08-11 11:47:19 -05:00
Andreas Fischer
d9e9504fba
Merge branch 'PSR2-1.0' into PSR2-2.0
...
* PSR2-1.0:
Fix indentation phpcbf did not fix.
Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
Use phpcbf to fix PHP code to ruleset.
Ignore coding guidelines in ANSI switch block.
Base code sniffer ruleset on PSR2 rather than PEAR.
Update PHP Code Sniffer to 2.3.3
Conflicts:
build/code-sniffer-ruleset-tests.xml
build/code-sniffer-ruleset.xml
composer.lock
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RSA.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
tests/Unit/Crypt/TwofishTest.php
2015-07-17 13:41:59 +02:00
Andreas Fischer
2013a31ecd
Use phpcbf to fix PHP code to ruleset.
2015-07-17 12:57:41 +02:00
terrafrost
ab489801fe
Tests/RSA: pack expected result
2015-05-31 10:07:18 -05:00
terrafrost
2536d224ee
Tests/RSA: pack expected result
2015-05-31 10:06:13 -05:00
terrafrost
6bce2c79ac
Tests/RSA: re-added accidentally removed $rsa initialization
2015-05-31 09:20:03 -05:00
terrafrost
1316fd45f4
Tests/RSA: use correct constant
2015-05-31 09:17:53 -05:00
terrafrost
0166d3a7ec
Tests/RSA: fix error
2015-05-31 02:20:16 -05:00
terrafrost
71104e8120
Merge branch 'rsa-none-1.0' into rsa-none-2.0
...
Conflicts:
tests/Unit/Crypt/RSA/ModeTest.php
2015-05-31 02:19:06 -05:00
terrafrost
26d528855a
Tests/RSA: hard-coded key and result
2015-05-31 02:13:11 -05:00
terrafrost
30260f3321
Merge branch 'rsa-none-1.0' into rsa-none-2.0
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-05-25 22:36:10 -05:00
terrafrost
1d924cfc7b
RSA: add "none" encryption mode
2015-05-25 22:30:38 -05:00
terrafrost
f19bf7a07d
RSA: backport getPublicKeyFingerprint from Lukas-W's PR
2015-05-06 22:55:12 -05:00
Lukas W
a67f4df164
RSA: Add support for calculating a public key's fingerprint
2015-05-04 09:21:37 +02: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
188cef4665
Tests/DES: method is testing decryption - not encryption
2015-04-02 22:20:02 -05:00
terrafrost
46d22b962d
yet another typo in unit test
2015-04-02 07:07:58 -05:00
terrafrost
4c8a56f2ad
Tests: more typos
2015-04-02 06:43:33 -05:00
terrafrost
1fa4734acd
Tests/Blowfish - fix typo
2015-04-02 06:31:36 -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
fbfc935a1e
Tests/RC2: rm space
2015-01-26 20:06:01 -06:00
terrafrost
a467c9e0bd
Tests/RC2: use data provider
2015-01-26 19:51:57 -06:00
terrafrost
8b8d9ac423
Tests/RC2: add test vectors
2015-01-26 19:24:48 -06:00
terrafrost
808a460f15
Tests/Twofish: disable padding
2015-01-19 22:00:49 -06:00
terrafrost
06d9f07830
Tests/Twofish: fix E_NOTICE
2015-01-19 21:19:12 -06:00
terrafrost
b852e8c6cb
Tests: add twofish unit test
2015-01-19 20:52:25 -06:00
terrafrost
c90010297c
Tests/TripleDES: CS adjustments
2015-01-17 10:33:12 -06:00
terrafrost
eaf2397cb6
Tests/TripleDES: fix one last error
2015-01-17 10:17:23 -06:00
terrafrost
1547ec497a
Tests/TripleDES: another syntax error
2015-01-17 10:04:01 -06:00
terrafrost
fb41f3492b
Tests/TripleDES: fix syntax error
2015-01-17 09:56:32 -06:00
terrafrost
e9470d1fc5
TripleDES: updates to accomodate inner chaining
2015-01-17 09:42:47 -06: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
569967de20
Tests/Blowfish: CS adjustments
2015-01-14 20:28:23 -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
b34a05887c
Tests: add Blowfish test
2015-01-07 21:23:04 -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
805c99458b
Tests/TripleDES: fix data provider for new test vectors
2014-12-31 19:18:57 -06:00
terrafrost
9199e624b2
Tests/TripleDES: add more test vectors
2014-12-31 15:41:43 -06:00
terrafrost
50a0ae7b6e
Test/AES: don't test stuff with only one buffer
2014-12-31 15:15:15 -06:00
terrafrost
f9451c826a
Tests/AES: add testNonContinuousBufferBatteryCombos
2014-12-31 15:00:54 -06:00
terrafrost
cf17141930
Tests/TripleDES: disable padding
2014-12-29 10:25:31 -06: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
1d2a85a319
another fix for 3DES unit test
2014-12-25 10:09:04 -06:00
terrafrost
7ea7463855
fix 3DES unit test
2014-12-25 09:47:36 -06:00
terrafrost
f891410b3d
add 3DES unit test
2014-12-25 03:09:37 -06:00
terrafrost
432700db8f
Tests/RC4: key is already packed
2014-12-21 10:16:37 -06:00
terrafrost
45a5c05da6
Tests: rename tests so that they actually run
2014-12-21 09:54:44 -06:00
terrafrost
7c5e7a0a72
Tests/RC4: engines weren't being set correctly
2014-12-20 13:17:15 -06:00
terrafrost
31dcbc919c
Tests/RC4: add more RC4 test vectors
2014-12-20 12:47:47 -06:00
terrafrost
1e1615080b
Tests/RC4: test updates
2014-12-20 12:24:07 -06:00
terrafrost
b703fbe12b
Tests: add RC4 unit tests
2014-12-20 12:21:17 -06:00
terrafrost
baf65d3fef
Tests: small unit test updates
2014-12-20 11:14:08 -06:00
Andreas Fischer
ffb2fcab80
Remove side-effects from test files.
2014-12-17 04:50:18 +01:00
Clint Nelissen
fe742e18d7
Namespaced Crypt Package
2014-12-16 16:16:54 -08:00
terrafrost
8f27aaa323
Tests (DES): i didn't realize last commit included all the changes that it did
...
not all of them were ready to go out. i just meant for it to include a one-line change.
meh.
2014-12-13 15:10:47 -06:00
terrafrost
c8281dd4a3
Tests (DES): disable padding for decryption test
...
When padding is enabled $des->decrypt() will return false with ciphertext's
of invalid length. Which makes sense. Null padding doesn't work when padding
is enabled because 0 isn't a valid PKCS7 padding character (has to be between
1 and the block_length, inclusive).
2014-12-13 15:00:38 -06:00
terrafrost
b1fdbd6bbd
Tests: CRYPT_MODE_* -> CRYPT_ENGINE_* in one more place
2014-12-13 14:42:58 -06:00
terrafrost
8d40eb22ef
Tests: update unit tests to use CRYPT_ENGINE_* instead of CRYPT_MODE_*
2014-12-13 14:34:48 -06:00