terrafrost
baf65d3fef
Tests: small unit test updates
2014-12-20 11:14:08 -06:00
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
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
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
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
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
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
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
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
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
Andreas Fischer
9672b31af0
Add a functional test case for SSH2 login using Agent.
2014-12-10 00:27:53 +01:00
Andreas Fischer
0efae5a91e
Change copyright years from roman numeral to decimal numbers.
2014-12-10 00:04:08 +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
terrafrost
9a55ab1892
Blowfish: syntax error
2014-12-07 14:43:30 -06: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
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
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
d6c210984c
Use assertArrayNotHasKey().
2014-12-05 00:18: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
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
Andreas Fischer
f2a08f7b6c
Some tests for crypt_random_string().
2014-12-04 19:23:22 +01:00
Andreas Fischer
f40bb9190f
SCP: Add missing space after case statement.
2014-12-04 18:42:47 +01:00
David Anderson
14dc468b70
Quote shell argument with escapeshellarg()
...
Currently, the call to "scp -t" or "scp -f" just uses naive quoting - i.e. a couple of quote marks are thrown in.
But, this can easily be escaped from - if the filename has a quote mark of its own in it, for example.
e.g. if the filename is as follows, then bad things will happen:
";rm -rf /
Instead, escapeshellarg should be used, to make sure it gets escaped properly.
2014-12-04 16:50:23 +00:00
Andreas Fischer
630a71bee6
Merge pull request #522 from DavidAnderson684/patch-1
...
Avoid calling fclose(false)
* DavidAnderson684/patch-1:
Avoid calling fclose(false)
2014-12-03 23:08:51 +01:00
David Anderson
647a1e9a5e
Avoid calling fclose(false)
...
The previous code would always call fclose(false) if the file was not successfully opened - resulting in a PHP notice.
2014-12-03 19:29:46 +00:00
Andreas Fischer
bce3c02126
Merge pull request #517 from GrahamCampbell/deps
...
Updated dependencies
* GrahamCampbell/deps:
Updated dependencies
2014-12-03 12:30:12 +01:00
