Commit Graph

16 Commits

Author SHA1 Message Date
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
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
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
Clint Nelissen
fe742e18d7 Namespaced Crypt Package 2014-12-16 16:16:54 -08: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
Andreas Fischer
de69f3b83f Use _MODE instead of the incorrect _ENGINE.
Partially reverts 0305a4827c.
2014-12-12 20:15:43 +01: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
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
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