octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-26 03:27:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,857 Commits 4 Branches 123 Tags 21 MiB
ecdd97f8a8
Commit Graph

1857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
a98714031c Merge pull request #458 from bantu/sftp-put-from-local 
SFTP: Add test for put() from local file.

* bantu/sftp-put-from-local:
  SFTP: Add test for put() from local file.
 2014-12-12 17:39:15 +01:00
Andreas Fischer
ca4bcc180e SFTP: Add test for put() from local file. 2014-12-12 17:09:55 +01:00
Andreas Fischer
609532df25 Merge branch 'master' into php5 
* master:
  Setup SSH key and agent for travis user.
  Add a functional test case for SSH2 login using Agent.
 2014-12-12 12:48:26 +01:00
Andreas Fischer
6d42873b87 Merge pull request #552 from bantu/ssh2-agent-login-test 
SSH2 Agent Login Test

* bantu/ssh2-agent-login-test:
  Setup SSH key and agent for travis user.
  Add a functional test case for SSH2 login using Agent.
 2014-12-12 12:48:21 +01:00
Andreas Fischer
fa410ab2e8 Setup SSH key and agent for travis user. 2014-12-12 12:32:44 +01:00
Andreas Fischer
2b1a0229e1 Merge branch 'master' into php5 
* master:
  Allow SCP test to run on 5.2 by not depending on GMP, but also allowing bcmath.

Conflicts:
	tests/PhpseclibFunctionalTestCase.php
 2014-12-12 12:17:57 +01:00
Andreas Fischer
5a0c27a725 Merge pull request #560 from bantu/php-5.2-functional-gmp 
Make SCP test on 5.2 run by allowing bcmath.

* bantu/php-5.2-functional-gmp:
  Allow SCP test to run on 5.2 by not depending on GMP, but also allowing bcmath.
 2014-12-12 12:16:50 +01:00
Andreas Fischer
ce2c7c7591 Allow SCP test to run on 5.2 by not depending on GMP, but also allowing bcmath. 2014-12-12 11:59:51 +01:00
Andreas Fischer
be7e2e48ef Merge branch 'master' into php5 
* master:
 2014-12-10 02:10:11 +01:00
Andreas Fischer
68633d9b30 Merge pull request #550 from bantu/fix-547-php5 
Change copyright years from roman numeral to decimal numbers for php5.

* bantu/fix-547-php5:
  Change copyright years from roman numeral to decimal numbers for php5.
  Change copyright years from roman numeral to decimal numbers.
 2014-12-10 02:10:05 +01:00
Andreas Fischer
80ba3cd54a 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.
 2014-12-10 02:09:57 +01:00
Clint Nelissen
cea5e317b6 Namespaced classes 2014-12-09 16:53:05 -08:00
Andreas Fischer
9672b31af0 Add a functional test case for SSH2 login using Agent. 2014-12-10 00:27:53 +01:00
Andreas Fischer
36999bd25a Change copyright years from roman numeral to decimal numbers for php5. 2014-12-10 00:07:46 +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
Andreas Fischer
651b6346a3 Merge pull request #548 from cnelissen/CryptPackageConstantsFix2 
Crypt package constants fix #2

* cnelissen/CryptPackageConstantsFix2:
  Moved globally defined constants to class constants
 2014-12-09 20:53:41 +01:00
Clint Nelissen
0305a4827c Moved globally defined constants to class constants 2014-12-09 10:46:30 -08:00
Andreas Fischer
27e9364d96 Merge pull request #532 from cnelissen/NetPackageConstantsFix 
Net package constants fix

* cnelissen/NetPackageConstantsFix:
  Moved global constants to class constants
 2014-12-09 17:39:28 +01:00
Andreas Fischer
be44f6c8a4 Merge branch 'master' into php5 
* master:
  SCP: Allow for null byte in tests as long as #146 is under investigation.
  Some SCP tests.
  Infrastructure for obtaining temporary files.
 2014-12-09 13:35:44 +01:00
Andreas Fischer
1c949e47c8 Merge pull request #529 from bantu/scp-tests 
Some SCP tests.

* bantu/scp-tests:
  SCP: Allow for null byte in tests as long as #146 is under investigation.
  Some SCP tests.
  Infrastructure for obtaining temporary files.
 2014-12-09 13:35:38 +01:00
Andreas Fischer
51ea6255c8 SCP: Allow for null byte in tests as long as #146 is under investigation. 2014-12-09 13:21:59 +01:00
Andreas Fischer
494e0d68eb Some SCP tests. 2014-12-09 13:21:59 +01:00
Andreas Fischer
4dc6179207 Infrastructure for obtaining temporary files. 2014-12-09 13:10:34 +01:00
Clint Nelissen
ecb9c32f02 Merge branch 'php5' of https://github.com/phpseclib/phpseclib into NetPackageConstantsFix 
Conflicts:
	phpseclib/Net/SSH2.php
 2014-12-08 10:40:57 -08:00
Andreas Fischer
c7620a535c Merge pull request #544 from bantu/cnelissen-BigIntegerConstantsFix 
Refactor defined MATH_BIGINTEGER_ constants into class constants.

* bantu/cnelissen-BigIntegerConstantsFix:
  Add #@+ block for properties used by internal implementation.
  Move in-code comments to property doc blocks.
  Refactor defined MATH_BIGINTEGER_ constants into class constants.
 2014-12-08 19:12:46 +01:00
Andreas Fischer
2f27620409 Add #@+ block for properties used by internal implementation. 2014-12-08 16:02:39 +01:00
Andreas Fischer
8ecf956499 Move in-code comments to property doc blocks. 2014-12-07 23:00:59 +01:00
Clint Nelissen
f5d6b7423d Refactor defined MATH_BIGINTEGER_ constants into class constants. 2014-12-07 22:33:39 +01:00
terrafrost
9a55ab1892 Blowfish: syntax error 2014-12-07 14:43:30 -06:00
Andreas Fischer
05ae7a1e66 Merge pull request #542 from bantu/fix-540 
Add public keyword to Crypt\Random::string().

* bantu/fix-540:
  Add public keyword to Crypt\Random::string().
 2014-12-07 15:20:49 +01:00
Andreas Fischer
7b7e7d8de5 Add public keyword to Crypt\Random::string(). 2014-12-07 15:14:34 +01:00
terrafrost
69614034ec Crypt_Base: fix to the IV handling of the last commit 2014-12-07 07:35:30 -06:00
terrafrost
b35cedcb15 Crypt_Base: deal with IV's more appropriately 2014-12-06 23:36:26 -06:00
Andreas Fischer
e52a3aff5a Merge branch 'master' into php5 
* master:
  SSH2: simplify _send_channel_packet
 2014-12-06 12:25:16 +01:00
Andreas Fischer
4ba7bfb6da Merge pull request #538 from terrafrost/window-size-changes 
SSH2: simplify _send_channel_packet

* terrafrost/window-size-changes:
  SSH2: simplify _send_channel_packet
 2014-12-06 12:25:11 +01:00
terrafrost
96eb1f3797 SSH2: simplify _send_channel_packet 
the last _send_channel_packet was unnecessarily complex. this lead
to a number of problems. for example,

the window size was checked for adjustments in two places. in the
second place it receives a window adjustment packet and just assumes
that the window adjustment packet was big enough for the rest of the
data.

(thanks, pixall!)
 2014-12-05 22:01:39 -06: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
6b8079f87a Merge pull request #533 from bantu/random-tests-php5 
Some tests for crypt_random_string().

* bantu/random-tests-php5:
  crypt_random_string() -> Random::string()
 2014-12-05 00:48:46 +01:00
Andreas Fischer
deb8f4f03c Merge branch 'master' into php5 
* master:
  Use assertArrayNotHasKey().
  Some tests for crypt_random_string().
 2014-12-05 00:47:13 +01:00
Andreas Fischer
1698880660 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:47:07 +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
Clint Nelissen
99b9cc477d Moved global constants to class constants 2014-12-04 13:45:13 -08:00
Andreas Fischer
01650cf7d7 Merge pull request #524 from cnelissen/SystemPackageConstantsFix 
System package constants fix

* cnelissen/SystemPackageConstantsFix:
  Added SSH_AGENT_FAILURE constant back in
  Missed a couple SYSTEM_ prefixes
  Moved global constants to class constants
 2014-12-04 20:05:55 +01:00
Andreas Fischer
a3f52dcf61 Merge branch 'master' into php5 
* master:
  Quote shell argument with escapeshellarg()
 2014-12-04 20:00:45 +01:00
Andreas Fischer
262da528a0 Merge pull request #527 from DavidAnderson684/patch-2 
Quote shell argument with escapeshellarg()

* DavidAnderson684/patch-2:
  Quote shell argument with escapeshellarg()
 2014-12-04 20:00:41 +01:00
Andreas Fischer
243ad0c54a Merge branch 'master' into php5 
* master:
  SCP: Add missing space after case statement.
 2014-12-04 19:56:34 +01:00
Andreas Fischer
067699bce2 Merge pull request #528 from bantu/scp-case 
SCP: Add missing space after case statement.

* bantu/scp-case:
  SCP: Add missing space after case statement.
 2014-12-04 19:56:29 +01:00