Commit Graph

1786 Commits

Author SHA1 Message Date
terrafrost
5d0cb1cee9 Crypt/Base: more fixes to pre 5.4.0 padding adjustments 2014-12-14 12:00:34 -06:00
terrafrost
d9adb66609 Crypt/Base: fix typo 2014-12-14 11:03:12 -06:00
terrafrost
4cc23b7006 Crypt/Base: $block_size -> $this->block_size 2014-12-14 10:48:18 -06:00
terrafrost
31af2b3ed3 Crypt/Base: fix decryption for ECB / CBC on PHP < 5.4.0 2014-12-14 10:40:40 -06:00
Andreas Fischer
16503848a4 Merge branch 'master' into php5
* master:
  Run HHVM tests in parallel.
2014-12-14 01:51:44 +01:00
Andreas Fischer
eefcb55138 Merge pull request #565 from bantu/hhvm-parallel
Run HHVM tests in parallel.

* bantu/hhvm-parallel:
  Run HHVM tests in parallel.
2014-12-14 01:51:38 +01:00
Andreas Fischer
10050c1748 Run HHVM tests in parallel. 2014-12-14 01:27:57 +01:00
terrafrost
8f27aaa323 Tests (DES): i didn't realize last commit included all the changes that it did
not all of them were ready to go out. i just meant for it to include a one-line change.

meh.
2014-12-13 15:10:47 -06:00
terrafrost
c8281dd4a3 Tests (DES): disable padding for decryption test
When padding is enabled $des->decrypt() will return false with ciphertext's
of invalid length. Which makes sense. Null padding doesn't work when padding
is enabled because 0 isn't a valid PKCS7 padding character (has to be between
1 and the block_length, inclusive).
2014-12-13 15:00:38 -06:00
terrafrost
b1fdbd6bbd Tests: CRYPT_MODE_* -> CRYPT_ENGINE_* in one more place 2014-12-13 14:42:58 -06:00
terrafrost
8d40eb22ef Tests: update unit tests to use CRYPT_ENGINE_* instead of CRYPT_MODE_* 2014-12-13 14:34:48 -06:00
terrafrost
51c0deba45 Crypt/Base: update one more comment 2014-12-13 14:22:12 -06:00
terrafrost
7d31f924a8 Crypt/Base: clean up comments 2014-12-13 14:20:25 -06:00
terrafrost
7e2d0147b6 Tests: don't set CRYPT_MODE_CIPHER to CRYPT_MODE_MCRYPT 2014-12-13 14:17:10 -06:00
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