terrafrost
c5f74eb3a3
Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support
2014-12-13 14:15:34 -06:00
terrafrost
8d8c2693c5
Crypt: rm @version stuff
2014-12-13 14:13:24 -06:00
terrafrost
f5f9c3d409
Crypt: replace CRYPT_MODE_INTERNAL/MCRYPT/OPENSSL with CRYPT_ENGINE_*
2014-12-13 13:58:41 -06:00
terrafrost
4d6e7efda6
Tests: CS adjustments
2014-12-13 13:47:37 -06:00
Andreas Fischer
768ac083dc
Merge pull request #564 from bantu/engine-back-to-mode
...
Use _MODE instead of the incorrect _ENGINE.
* bantu/engine-back-to-mode:
Use _MODE instead of the incorrect _ENGINE.
2014-12-12 22:22:39 +01:00
Andreas Fischer
30ef0e164f
Merge branch 'master' into php5
...
* master:
Properly skip SFTPLargeFileTest when environment variables not defined.
2014-12-12 22:22:23 +01:00
Andreas Fischer
956660e9b9
Merge pull request #562 from bantu/properly-skip-SFTPLargeFileTest
...
Properly skip SFTPLargeFileTest when environment variables not defined.
* bantu/properly-skip-SFTPLargeFileTest:
Properly skip SFTPLargeFileTest when environment variables not defined.
2014-12-12 22:22:07 +01:00
Andreas Fischer
46075077ac
Merge branch 'master' into php5
...
* master:
Update Code Sniffer to version 1.5.6
2014-12-12 22:21:54 +01:00
Andreas Fischer
93213ccc70
Merge pull request #563 from bantu/code-sniffer-1.5.6
...
Update Code Sniffer to version 1.5.6
* bantu/code-sniffer-1.5.6:
Update Code Sniffer to version 1.5.6
2014-12-12 22:21:13 +01:00
Andreas Fischer
de69f3b83f
Use _MODE instead of the incorrect _ENGINE.
...
Partially reverts 0305a4827c
2014-12-12 20:15:43 +01:00
Clint Nelissen
0547d182fc
Update Code Sniffer to version 1.5.6
2014-12-12 19:44:25 +01:00
Andreas Fischer
f1865af505
Properly skip SFTPLargeFileTest when environment variables not defined.
2014-12-12 19:38:04 +01:00
Andreas Fischer
3f912eed59
Merge pull request #554 from cnelissen/NamespaceFilePackage
...
Namespace file package
* cnelissen/NamespaceFilePackage:
Namespaced classes
2014-12-12 17:55:44 +01:00
Andreas Fischer
e0f8892521
Make SFTPLargeFileTest compatible with php5 branch.
2014-12-12 17:46:43 +01:00
Andreas Fischer
81ae4c924e
Merge branch 'master' into php5
...
* master:
SFTP: Add test for put() from local file.
2014-12-12 17:39:20 +01:00
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
