octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-27 11:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,759 Commits 4 Branches 123 Tags 21 MiB
32ce6a0d3e
Commit Graph

338 Commits

Author SHA1 Message Date
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
8f81fc8f28 Merge branch '1.0' of https://github.com/phpseclib/phpseclib into openssl-support 2015-03-15 02:45:32 -05:00
Andreas Fischer
f57e01df65 Merge branch '1.0' into 2.0 
* 1.0:
  Tests/X509: add unit test
  X509: make it so you can use File_ASN1_Element for custom X.509 extensions
 2015-03-10 13:46:15 +01:00
terrafrost
dad8a9ef37 Tests/X509: add unit test 2015-03-10 01:39:13 -05:00
Andreas Fischer
63ed03b119 Merge branch '1.0' into 2.0 
* 1.0:
  Tests/X509: swap expected and actual value
  Tests/X509: fix unit test
  Tests/X509: add unit test for unsupported extension encoding
  X509: always base64-encode extensions for which _getMapping returns a bool
 2015-03-05 15:37:46 +01:00
terrafrost
31e2308ea9 Tests/X509: swap expected and actual value 2015-03-04 23:37:33 -06:00
terrafrost
cc08406a76 Tests/X509: fix unit test 2015-03-04 08:18:54 -06:00
terrafrost
3e1aa8c213 Tests/X509: add unit test for unsupported extension encoding 2015-03-04 08:03:02 -06: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
009d883d4c Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support 2015-01-14 20:13:08 -06:00
Andreas Fischer
38e6196127 Merge branch 'master' into php5 
* master:
  ASN1: empty constructed context-specific tags error'd out

Conflicts:
	phpseclib/File/ASN1.php
 2015-01-11 16:09:50 +01:00
terrafrost
84325d415e ASN1: empty constructed context-specific tags error'd out 
eg. an attributes field in a CSR that's blank
 2015-01-10 23:58:50 -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
162e2f26cf Tests/SSH2: syntax error 2014-12-30 00:57:01 -06:00
terrafrost
46f81c98ab Tests/SSH2: update testGenerateIdentifier test 2014-12-30 00:27:27 -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
Clint Nelissen
628949fb73 Namespaced classes 2014-12-15 14:29:20 -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
terrafrost
c5f74eb3a3 Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support 2014-12-13 14:15:34 -06:00
terrafrost
4d6e7efda6 Tests: CS adjustments 2014-12-13 13:47:37 -06:00
Andreas Fischer
de69f3b83f Use _MODE instead of the incorrect _ENGINE. 
Partially reverts 0305a4827c.
 2014-12-12 20:15:43 +01:00
Andreas Fischer
3f912eed59 Merge pull request #554 from cnelissen/NamespaceFilePackage 
Namespace file package

* cnelissen/NamespaceFilePackage:
  Namespaced classes
 2014-12-12 17:55:44 +01:00
Clint Nelissen
cea5e317b6 Namespaced classes 2014-12-09 16:53:05 -08:00
Andreas Fischer
c4b103468c Merge pull request #549 from bantu/fix-547 
Change copyright years from roman numeral to decimal numbers.

* bantu/fix-547:
  Change copyright years from roman numeral to decimal numbers.

Conflicts:
	phpseclib/System/SSH_Agent.php
 2014-12-10 00:06:08 +01:00
Andreas Fischer
0efae5a91e Change copyright years from roman numeral to decimal numbers. 2014-12-10 00:04:08 +01:00
Clint Nelissen
0305a4827c Moved globally defined constants to class constants 2014-12-09 10:46:30 -08:00
Clint Nelissen
f5d6b7423d Refactor defined MATH_BIGINTEGER_ constants into class constants. 2014-12-07 22:33:39 +01:00
Andreas Fischer
da2ea27e7a Merge pull request #523 from cnelissen/FilePackageConstantsFix 
File package constants fix

* cnelissen/FilePackageConstantsFix:
  Docblock fix
  Moved global constants into class constants and updated all references
 2014-12-05 01:00:01 +01:00
Andreas Fischer
c036787a1a crypt_random_string() -> Random::string() 2014-12-05 00:20:19 +01:00
Andreas Fischer
4133da34db Merge pull request #530 from bantu/random-tests 
Some tests for crypt_random_string().

* bantu/random-tests:
  Use assertArrayNotHasKey().
  Some tests for crypt_random_string().
 2014-12-05 00:19:25 +01:00
Andreas Fischer
d6c210984c Use assertArrayNotHasKey(). 2014-12-05 00:18:45 +01:00
Andreas Fischer
f2a08f7b6c Some tests for crypt_random_string(). 2014-12-04 19:23:22 +01:00
Clint Nelissen
a9925941b0 Moved global constants into class constants and updated all references 2014-12-03 18:20:10 -08:00
terrafrost
f6e0c4b506 Crypt: add OpenSSL support 
aside from the addition of OpenSSL support a few other changes have been included:

- setEngine(), as added by petrich, is depricated (not that it was ever in trunk to begin with)
  it has been replaced with isValidEngine() and setPreferredEngine().
- replace _generate_xor() with increment_str()
  _increment_str() had extra functionality that wasn't being used. ie. it could concatenate
  multiple successive string increments to one another automatically. but not only was that
  functionality not used - it also made the function less versatile. _increment_str() can be
  used more easily for iterative brute forcing (for example)
- rename Crypt_Base::_stringShift to Crypt_Base::_string_shift (for consistency)
- more expansive unit test coverage
 2014-11-29 07:39:21 -06:00
terrafrost
e7708b0d20 AES: update unit tests 2014-10-15 17:59:48 -05:00
Andreas Fischer
eff5f64560 Merge branch 'master' into php5 
* master:
  ASN1: fix unit test
  ASN1: add unit test for non-constructed context-specific change
  ASN1: fix issue with non-constructed context-specific tags
  README: update download link to 0.3.8
 2014-09-24 16:50:12 +02:00
terrafrost
3785bebcce ASN1: fix unit test 2014-09-24 00:07:49 -05:00
terrafrost
a2f4a2cbba ASN1: add unit test for non-constructed context-specific change 2014-09-22 23:03:06 -05:00
Andreas Fischer
5fa5a137dc Merge branch 'master' into php5 
* master:
  RSA: syntax error in unit tests
  RSA: make unit tests perform string comparisons sans white space chars
  RSA: update unit test
  RSA: add unit test
  RSA: make XML keys use unsigned integers
 2014-09-09 16:42:07 +02:00
terrafrost
f6bd3542b3 RSA: syntax error in unit tests 2014-09-09 00:43:28 -05:00
terrafrost
e092733808 RSA: make unit tests perform string comparisons sans white space chars 2014-09-09 00:34:41 -05:00
terrafrost
c489852332 RSA: update unit test 2014-09-09 00:28:38 -05:00
terrafrost
4329015629 RSA: add unit test 2014-09-08 22:26:14 -05:00
Andreas Fischer
6360f2f8b8 Merge branch 'master' into php5 
* master:
  ASN1Test: Even better, use assertCount instead of assertSame.
  ASN1Test: The expected value comes first in assertEquals/assertSame.
  ASN1Test: Also check the type by using assertSame instead of assertEquals.
 2014-09-04 22:54:01 +02:00
Andreas Fischer
9c3ce656f4 ASN1Test: Even better, use assertCount instead of assertSame. 2014-09-04 22:33:41 +02:00
Andreas Fischer
8e3b83af56 ASN1Test: The expected value comes first in assertEquals/assertSame. 2014-09-04 22:27:33 +02:00
Andreas Fischer
7c2b399915 ASN1Test: Also check the type by using assertSame instead of assertEquals. 2014-09-04 22:26:37 +02:00
Andreas Fischer
6cb0528d6e Merge branch 'master' into php5 
* master:
  ASN1: one more unit test change
  ASN1: another unit test update
  ASN1: unit test adjustments
  ASN1: cs adjustments to unit test
  ASN1: add unit tests for indefinite length decoding
  ASN1: CS adjustment (rm whitespace at eol)
  ASN1: rewrite _decode_der

Conflicts:
	phpseclib/File/ASN1.php
 2014-09-04 22:22:16 +02:00
terrafrost
bb6d5d9bc0 ASN1: one more unit test change 2014-09-03 20:54:24 -05:00
terrafrost
8293b66136 ASN1: another unit test update 2014-09-03 20:28:07 -05:00
terrafrost
34866bf095 ASN1: unit test adjustments 2014-09-03 19:30:42 -05:00
terrafrost
36b4b13863 ASN1: cs adjustments to unit test 2014-09-03 00:36:43 -05:00
terrafrost
871e1a3070 ASN1: add unit tests for indefinite length decoding 2014-09-03 00:29:04 -05:00
Andreas Fischer
6ba2b374e5 Merge branch 'master' into php5 
* master:
  AES: don't do mcrypt unit tests if mcrypt extension is not available
  AES: a few final changes
  AES: set CRYPT_RIJNDAEL_MODE as well in unit tests
  AES: CS changes to unit tests
  AES: more unit test fixes
  AES: unit test updates
  AES: more unit test fixes
  AES: add new lines to end of unit tests
  AES: CS adjustments to unit tests
  AES: first attempt at unit tests for key padding
  Rijndael, AES: adjustments to what key sizes are and aren't allowed
 2014-08-15 16:27:36 +02:00
terrafrost
0d6fbb9e30 AES: don't do mcrypt unit tests if mcrypt extension is not available 2014-08-15 09:23:55 -05:00
terrafrost
aa0e7347ef AES: a few final changes 2014-08-14 23:09:17 -05:00
terrafrost
7a1b1df600 AES: set CRYPT_RIJNDAEL_MODE as well in unit tests 2014-08-14 11:27:27 -05:00
terrafrost
4d72d1b48d AES: CS changes to unit tests 2014-08-14 11:09:54 -05:00
terrafrost
d01c1b1eb7 AES: more unit test fixes 2014-08-14 10:59:37 -05:00
terrafrost
085ec03b53 AES: unit test updates 2014-08-14 10:47:26 -05:00
terrafrost
3fdd5731d1 AES: more unit test fixes 2014-08-14 10:37:10 -05:00
terrafrost
42e5c6845c AES: add new lines to end of unit tests 2014-08-14 10:31:57 -05:00
terrafrost
d88b7ed6dd AES: CS adjustments to unit tests 2014-08-14 10:06:25 -05:00
terrafrost
8cf6af94dd AES: first attempt at unit tests for key padding 2014-08-14 10:03:01 -05:00
Andreas Fischer
1089dfb797 Merge branch 'master' into php5 
* master:
  Hash: rm first parameter of testHMAC call
  Hash: fix unit tests
  Hash: refactor unit tests
 2014-08-11 20:55:09 +02:00
terrafrost
89970885ed Hash: rm first parameter of testHMAC call 2014-08-10 15:18:51 -05:00
terrafrost
3f897cf48b Hash: fix unit tests 2014-08-10 14:54:36 -05:00
terrafrost
fb2ecc6c18 Hash: refactor unit tests 2014-08-10 11:52:31 -05:00
Andreas Fischer
83485c130f Merge branch 'master' into php5 
* master:
  Hash: apply fixes to sha512 unit tests as well
  Hash: one more fix to unit test
  Hash: fix unit tests
  Hash: add unit tests
  Hash: add sha256-96 and sha512-96
 2014-08-10 17:59:08 +02:00
terrafrost
4fa96e384c Hash: apply fixes to sha512 unit tests as well 2014-08-10 09:14:33 -05:00
terrafrost
a52315a0cb Hash: one more fix to unit test 2014-08-10 09:08:52 -05:00
terrafrost
a906e83f2a Hash: fix unit tests 2014-08-10 02:07:54 -05:00
terrafrost
e3136ccd13 Hash: add unit tests 2014-08-10 02:01:21 -05:00
Andreas Fischer
4594bbb0dc Merge branch 'master' into php5 
* master:
  Add missing Unit prefix to class Math_BigInteger_InternalTest.
 2014-07-31 11:51:36 +02:00
Andreas Fischer
2d726cf0ed Add missing Unit prefix to class Math_BigInteger_InternalTest. 2014-07-31 11:41:57 +02:00
Andreas Fischer
e4516fb453 Merge branch 'master' into php5 
* master:
  Add some test cases for SHA512.
  Use toBits() as there is no bits property.
  SSH2: Disallow the none MAC.
 2014-07-26 17:20:09 +02:00
Andreas Fischer
daca5e914f Add some test cases for SHA512. 2014-07-26 13:49:42 +02:00
Andreas Fischer
970c55d6cc Remove side-effect from Net/SFTP/Stream.php. 2014-06-27 14:22:47 +02:00
Andreas Fischer
d25d115747 Merge branch 'master' into php5 
* master:
  Use get_called_class() if available.
  Add Net_SFTP_Stream::register() for easier autoloading.
  Add unit test for (to be added) Net_SFTP_Stream::register().
 2014-06-27 14:14:18 +02:00
Andreas Fischer
f360932343 Add unit test for (to be added) Net_SFTP_Stream::register(). 2014-06-27 00:21:55 +02:00
Andreas Fischer
8ba3dd0846 Merge branch 'master' into php5 
* master:
  Crypt/Base: readability improvement
  RSA: CS adjustments
  RSA: rename PUBLIC_FORMAT_PKCS1_RAW -> PUBLIC_FORMAT_PKCS8
  RSA: add PKCS8 unit tests
  RSA: add support for saving encrypted PKCS8 keys
  Crypt/Base: adjust default key size for pbkdf1
  RSA: add support for loading PKCS8 encrypted private keys
  Crypt/Base: add support for pbkdf1
  RSA: add support for saving to PKCS8 (unencrypted)
 2014-06-17 00:36:54 +02:00
Andreas Fischer
f807d8799e Merge pull request #370 from terrafrost/pkcs8 
RSA: add support for PKCS8 encoded private keys

* terrafrost/pkcs8:
  Crypt/Base: readability improvement
  RSA: CS adjustments
  RSA: rename PUBLIC_FORMAT_PKCS1_RAW -> PUBLIC_FORMAT_PKCS8
  RSA: add PKCS8 unit tests
  RSA: add support for saving encrypted PKCS8 keys
  Crypt/Base: adjust default key size for pbkdf1
  RSA: add support for loading PKCS8 encrypted private keys
  Crypt/Base: add support for pbkdf1
  RSA: add support for saving to PKCS8 (unencrypted)
 2014-06-17 00:36:54 +02:00
Andreas Fischer
fc417115be Merge branch 'master' into php5 
* master:
  BigInteger: one more change to the comments
  BigInteger: update comments
  BigInteger: unit test update
  BigInteger: change argument names for random / randomPrime
  BigInteger: fix unit tests
  BigInteger: fix syntax error
  BigInteger: make it so you can do $min->random($max)

Conflicts:
	phpseclib/Math/BigInteger.php
 2014-06-16 17:00:00 +02:00
terrafrost
92e6b23528 BigInteger: unit test update 2014-06-15 12:13:56 -05:00
terrafrost
281a8c669e BigInteger: fix unit tests 2014-06-14 20:47:57 -05:00
terrafrost
46166c7351 BigInteger: make it so you can do $min->random($max) 
...and $min->randomPrime($max) as well
 2014-06-14 14:07:33 -05:00
terrafrost
4878f2a99b RSA: add PKCS8 unit tests 2014-06-13 12:39:12 -05:00
Andreas Fischer
2a9d7e5e03 Merge branch 'master' into php5 
* master:
  X509: Unit test CS changes
  X509: move location of SPKAC unit test
  X509: CS adjustments
  X509: PHP4 compat changes
  RSA: PHP4 compat changes
  X509: rm trailing white space from unit test
  X509: add SPKAC unit test
  X509: add signSPKAC() and saveSPKAC() methods
 2014-06-05 16:56:36 +02:00
terrafrost
231566c1fb X509: Unit test CS changes 2014-06-05 09:23:22 -05:00
terrafrost
4a98679519 X509: move location of SPKAC unit test 2014-06-05 09:03:17 -05:00
Andreas Fischer
68ab62e70f Adjust test cases using Math_BigInteger. 2014-06-02 20:19:00 +02:00
Andreas Fischer
07e1f954de Merge pull request #325 from terrafrost/rsa-public-key 
RSA: auto-detect public keys vs private keys

* terrafrost/rsa-public-key:
  RSA: update unit test file
  RSA: auto-detect public keys vs private keys
 2014-06-01 22:17:38 +02:00
Andreas Fischer
c7d4fd937e Merge pull request #358 from bantu/ticket/321 
Reimplement testGenerateIdentifier

* bantu/ticket/321:
  Reimplement testGenerateIdentifier to fix #321
 2014-06-01 22:00:08 +02:00
Andreas Fischer
4af647f170 Split Unit/Functional Test Suites. 2014-06-01 21:13:20 +02:00