danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2024-12-16 02:46:57 +01:00
Code Issues Projects Releases Wiki Activity
2,399 Commits 1 Branch 21 Tags 11 MiB
b4743df277
Commit Graph

91 Commits

Author SHA1 Message Date
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
Scott
b7218aee28 Update Random.php 2016-03-27 10:54:39 -04:00
Scott
827e42222e Update Random.php 2016-03-27 10:49:03 -04:00
Paragon Initiative Enterprises
1ca62c2c33 Use random_compat 2016-03-24 16:44:56 -04:00
terrafrost
554dea27dd Merge branch '2.0' 2016-02-19 06:33:48 -06:00
terrafrost
4f0d3e4128 Merge branch '1.0' into 2.0 2016-02-19 06:33:34 -06:00
Joey3000
94b669d7ed Reorder array checks 
Make sure that `if (isset($arr['__phpseclib_marker']))` is done on an array only.
 2016-02-16 20:45:05 +01:00
Joey3000
062aa41ba0 Fixing Uncaught Error: Cannot use object of type test as array 
Refs https://github.com/phpseclib/phpseclib/pull/934/files#r53035721
 2016-02-16 19:41:41 +01:00
terrafrost
6eb35eb42c Random: a few more tweaks 2016-02-16 09:45:04 -06:00
Joey3000
047f2617f1 Circular reference handling improvement 
Refs https://github.com/phpseclib/phpseclib/pull/934/files#r52838650

This does the following:

* Addresses the comments to 102d53bd27

* Fixes an "Allowed memory size of ... bytes exhausted" issue and simplifies the implementation, bringing it closer to the example in https://stackoverflow.com/questions/9042142/detecting-infinite-array-recursion-in-php/9293146#9293146
 2016-02-14 13:40:58 +01:00
terrafrost
102d53bd27 Random: fix for issues with serialize() 2016-02-14 00:44:03 -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
Scott
d899b7988d Update random_bytes() to conform to PHP7.0.0-RC3 
Fixes #843
 2015-10-14 10:07:11 -05:00
Scott
29b1bb7a58 Update random_bytes() to conform to PHP7.0.0-RC3 
Fixes #843
 2015-10-09 15:19:59 -04:00
Andreas Fischer
5745c8a5be Merge branch '2.0' 
* 2.0:
  small CS changes
 2015-09-14 01:30:54 +02:00
terrafrost
8b8d7a5dcd small CS changes 2015-09-13 18:13:35 -05:00
Graham Campbell
dd031a1702 PHPDoc fixes 2015-09-06 12:28:08 +01:00
Andreas Fischer
0deae03dca Merge branch '2.0' 
* 2.0:
  Remove unnecessary parens
  Convert most instances of function_exists() to extension_loaded() where applicable
  Remove conditions for PHP < 5.3.0 for this branch
  Switch to extension_loaded('gmp')
  Switch to extension_loaded instead of function_exists where it makes sense
 2015-09-04 15:05:50 +02:00
Andreas Fischer
864493bbf6 Merge pull request #790 from cweagans/switch-to-extension-loaded-2.0 
Switch to extension loaded (2.0)

* cweagans/switch-to-extension-loaded-2.0:
  Remove conditions for PHP < 5.3.0 for this branch
  Switch to extension_loaded('gmp')
  Switch to extension_loaded instead of function_exists where it makes sense
 2015-09-04 15:05:40 +02:00
Andreas Fischer
e08e2fd300 Merge pull request #791 from cweagans/switch-to-extension-loaded-1.0 
Switch to extension loaded (1.0)

* cweagans/switch-to-extension-loaded-1.0:
  Remove unnecessary parens
  Convert most instances of function_exists() to extension_loaded() where applicable
 2015-09-04 15:04:17 +02:00
Andreas Fischer
ed6f754137 Merge pull request #803 from GrahamForks/phpdoc 
[3.0] PHPDoc Fixes

* GrahamForks/phpdoc:
  Fixed lots of phpdoc typos
  Fixed invalid param phpdoc
 2015-09-02 20:49:05 +02:00
Andreas Fischer
40927a4033 Merge pull request #802 from GrahamForks/2.0-phpdoc 
[2.0] PHPDoc Fixes

* GrahamForks/2.0-phpdoc:
  Fixed lots of phpdoc typos
  Fixed invalid param phpdoc
 2015-09-02 20:47:45 +02:00
Andreas Fischer
618215dd0d Merge branch '2.0' 
* 2.0:
  Backport to 2.0: Add PHP7 to Travis CI.
  Remove duplicate allow_failures section
  Test on PHP 7 & allow failures
  Coding standards fix
  Switch from EngineException to Error
  Remove string assignment
  Use random_bytes() when appropriate.
 2015-09-02 20:38:11 +02:00
Graham Campbell
7cd45e5e1b Fixed lots of phpdoc typos 2015-09-02 00:44:55 +01:00
Graham Campbell
634c1c2a18 Fixed lots of phpdoc typos 2015-09-02 00:42:15 +01:00
Graham Campbell
cd0e10cf9d Fixed lots of phpdoc typos 2015-09-02 00:37:54 +01:00
Cameron Eagans
8a5dc21835 Coding standards fix 2015-09-01 15:00:57 -04:00
Cameron Eagans
bbbfc1795d Switch from EngineException to Error 2015-09-01 14:56:06 -04:00
Cameron Eagans
08025c134d Remove string assignment 2015-09-01 14:53:45 -04:00
Cameron Eagans
5a5edc7798 Use random_bytes() when appropriate. 2015-09-01 14:49:32 -04:00
Cameron Eagans
2b75c37cc9 Convert most instances of function_exists() to extension_loaded() where applicable 2015-09-01 14:32:22 -04:00
Cameron Eagans
a84699a346 Switch to extension_loaded instead of function_exists where it makes sense 2015-09-01 14:22:12 -04:00
terrafrost
2a8da097ae Merge branch 'master' into exceptions-v1 
Conflicts:
	phpseclib/Net/SSH2.php
 2015-08-31 23:47:12 -05:00
terrafrost
081f2cb825 Random: replace user_error with exception 2015-07-18 00:50:59 -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
d75f703c0a rm PHP v4 compatability claim 2015-04-02 05:57:52 -05:00
Clint Nelissen
fe742e18d7 Namespaced Crypt Package 2014-12-16 16:16:54 -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
Andreas Fischer
7b7e7d8de5 Add public keyword to Crypt\Random::string(). 2014-12-07 15:14:34 +01:00
Andreas Fischer
638e62d60a Remove LICENSE text from source code files. 2014-12-03 18:49:33 +01:00
Clint Nelissen
d6029bdb6a Removed includes for Random.php and fixed up user_error message 2014-12-02 09:34:15 -08:00
Clint Nelissen
f5ed86e385 Renamed Random::crypt_random_string to Random::string 2014-12-02 09:20:40 -08:00
Clint Nelissen
c70702afbb Namespaced Crypt\Random 2014-12-02 08:41:30 -08:00
Clint Nelissen
bc3deb191f Code sniff fix 2014-12-01 19:01:00 -08:00
Clint Nelissen
9c0c3faeb7 Initial commit 2014-12-01 18:54:44 -08:00