danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2024-12-12 09:09:50 +01:00
Code Issues Projects Releases Wiki Activity
2,812 Commits 1 Branch 21 Tags 11 MiB
86b05c0081
Commit Graph

133 Commits

Author SHA1 Message Date
terrafrost
86b05c0081 Merge branch '1.0' into 2.0 2019-02-10 17:20:21 -06:00
terrafrost
fcfba38fc7 Crypt: avoid bogus IV errors in ECB mode 2019-02-10 17:18:40 -06:00
terrafrost
99dcf43a7a Merge branch '1.0' into 2.0 2018-10-13 08:21:22 -05:00
terrafrost
048635669e Crypt/Base: create hmac object outside of while loop 2018-10-13 08:20:09 -05:00
terrafrost
f0f7350045 Crypt/Base: if derived key length is 0 or less use hash length 2018-10-13 08:10:34 -05:00
Jakob Gahde
8e6948fdd2
Backport CFB8 support from master 2018-03-27 04:32:16 +02:00
terrafrost
37922e5b4c Merge branch '1.0' into 2.0 2017-12-17 15:05:15 -06:00
terrafrost
6930560ae6 more adjustments for ARM CPU's 2017-12-17 14:52:43 -06:00
terrafrost
d1470644a2 Merge branch '1.0' into 2.0 2017-10-05 05:28:47 -05:00
terrafrost
aeb8a98a25 Crypt/Base: fix version_compare call 2017-10-05 05:28:16 -05:00
terrafrost
2608074e74 Merge branch '1.0-use-eval' into 2.0-use-eval 2017-10-04 17:08:27 -05:00
terrafrost
98d46db7c5 Crypt/Base: use eval() instead of create_function() for >= 5.3 2017-10-04 17:03:14 -05:00
terrafrost
42f5399960 Crypt/Base: fix bad merge 2016-10-02 08:09:54 -05:00
terrafrost
3205c95177 Merge branch '1.0' into 2.0 2016-10-01 20:05:16 -05:00
terrafrost
640f10609f fix PHP 7.1 compatibility errors 2016-09-21 01:21:54 -05:00
terrafrost
845135f887 add PHP5-style constructors along side PHP4-style ones 2016-09-10 10:41:05 -07:00
terrafrost
c547ee16c7 Merge branch '1.0' into 2.0 2016-08-04 00:31:15 -05:00
klemens
dca95ac662 spelling fixes 2016-08-04 00:19:27 -05:00
terrafrost
c784d9e1e5 reapply PR #931 2016-05-08 01:34:37 -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 ef04c870e9, reversing
changes made to cd57bf31ae.
 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 to the 2.0 branch and resolved conflicts.
 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