klemens
dd23d91d41
spelling fixes
2016-08-04 00:47:52 -05:00
terrafrost
e64a55955f
Crypt/Base: trie -> true
2016-06-05 11:28:28 -05:00
terrafrost
e2a0b701c7
remove a few calls to paragonie/constant_time_encoding
...
- Hex::decode('aabb') can be replaced with "\xaa\xbb"
- Hex::decode(sha1('...')) can be replaced with sha1('...', true)
2016-06-04 22:31:23 -05:00
terrafrost
48fef11389
Merge branch 'cte'
2016-05-21 17:34:05 -05:00
Paragon Initiative Enterprises
adcbecae78
Use paragonie/constant_time_encoding
2016-05-21 12:57:53 -05:00
Paragon Initiative Enterprises
0e8fa93676
Use paragonie/constant_time_encoding
2016-05-12 16:28:40 -04: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
ae1e5c13f9
Merge branch 'master' into cipher-revamp
2016-02-20 21:44:00 -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
bfd467532b
Crypt/Base: fix continuous mode in CBC / decryption / OpenSSL
2016-02-06 08:59:05 -06:00
terrafrost
e74841477f
Crypt: become a lot less tolerant of bad parameters
2016-02-03 08:56:25 -06:00
terrafrost
cd700ce8b3
Merge branch '2.0'
2016-01-25 16:58:48 -06:00
Joey3000
bdc28b9453
Cherry-picking cleanup of use operator usage
...
Picked c9a80ff748
2016-01-21 19:41:41 +01:00
terrafrost
cea059e9dd
Crypt/Base: updates to IV handling per Joey3000
2016-01-20 10:09:06 -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
0e0bdf6210
Merge branch 'phpdoc-master'
...
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Rijndael.php
2015-10-13 09:31:21 -05:00
terrafrost
a9d353d391
Merge branch 'phpdoc-2.0' into 2.0
...
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Rijndael.php
2015-10-13 09:16:39 -05:00
terrafrost
5321b9b610
Merge branch 'phpdoc-1.0' into 1.0
...
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Rijndael.php
2015-10-13 08:52:52 -05:00
terrafrost
177b52088d
Merge branch '2.0'
2015-10-12 23:10:15 -05:00
terrafrost
0e3fdec56b
Merge branch 'getkeylength' into getkeylength-2.0-2
2015-10-12 22:53:59 -05:00
terrafrost
5f1ff099da
Crypt/Base: one more cs update
2015-10-12 22:52:56 -05:00
terrafrost
8686ced6d3
Merge branch 'phpdoc-2.0' into phpdoc-master
...
Conflicts:
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RSA.php
2015-10-12 21:37:44 -05:00
terrafrost
33ea01f1ac
Merge branch 'phpdoc-1.0' into phpdoc-2.0
...
Conflicts:
phpseclib/Crypt/AES.php
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RC2.php
phpseclib/Crypt/RC4.php
phpseclib/Crypt/RSA.php
phpseclib/Crypt/Rijndael.php
phpseclib/Crypt/TripleDES.php
phpseclib/Crypt/Twofish.php
phpseclib/File/ASN1.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SCP.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
phpseclib/System/SSH/Agent.php
2015-10-12 14:10:26 -05:00
terrafrost
2048a49aac
use self:: in phpdoc comments to reduce merge conflicts
2015-10-11 12:22:07 -05:00
terrafrost
19229ed224
phpDoc changes
2015-10-05 13:22:51 -05:00
terrafrost
49393d1b3a
Merge branch 'getkeylength' into getkeylength-2.0-2
...
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Rijndael.php
2015-10-04 21:38:47 -05:00
terrafrost
d91158f6ef
rename key_size -> key_length
2015-10-04 21:06:17 -05:00
terrafrost
26a0a0890c
Merge branch 'getkeylength' into getkeylength-2.0-2
...
Conflicts:
phpseclib/Crypt/RC2.php
phpseclib/Crypt/TripleDES.php
2015-10-04 16:40:15 -05:00
terrafrost
27034825f3
cs changes per bantu
2015-10-04 16:29:48 -05:00
terrafrost
1f47daede7
Merge branch 'getkeylength' into getkeylength-2.0-2
2015-09-24 09:29:56 -05:00
terrafrost
8691035228
Crypt/Base: add getBlockLength() method
2015-09-24 09:29:00 -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
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
Graham Campbell
eec8c9cb5d
More fixes
2015-09-06 12:39:14 +01:00
Andreas Fischer
70dc4448f7
Merge branch '2.0'
...
* 2.0:
Typo in variable name
2015-09-05 18:14:04 +02:00
Andreas Fischer
09ac065459
Merge branch '1.0' into 2.0
...
* 1.0:
Typo in variable name
2015-09-05 18:14:03 +02:00
Marc Delisle
01e7c65f07
Typo in variable name
2015-09-05 12:13:11 -04:00
Graham Campbell
7cd45e5e1b
Fixed lots of phpdoc typos
2015-09-02 00:44:55 +01:00
Graham Campbell
2be0506514
Fixed invalid param phpdoc
2015-09-02 00:44:39 +01:00
Graham Campbell
634c1c2a18
Fixed lots of phpdoc typos
2015-09-02 00:42:15 +01:00
Graham Campbell
c08c099c56
Fixed invalid param phpdoc
2015-09-02 00:41:38 +01:00
Graham Campbell
cd0e10cf9d
Fixed lots of phpdoc typos
2015-09-02 00:37:54 +01:00
Graham Campbell
5890f3da98
Fixed invalid param phpdoc
2015-09-02 00:22:30 +01:00
terrafrost
2a8da097ae
Merge branch 'master' into exceptions-v1
...
Conflicts:
phpseclib/Net/SSH2.php
2015-08-31 23:47:12 -05:00
