terrafrost
472e006b6c
SSH2: update conditions under which _disconnect's code is executed
2014-12-29 08:37:44 -06:00
terrafrost
09c03d0f75
Tests/DES: the expeted output of testDecryptPadding() was incorrect
...
(the expected output can be obtained by setting the key and iv both to 'd')
2014-12-28 23:15:45 -06:00
Andreas Fischer
c3a8f98dcb
Merge pull request #586 from GrahamForks/access-fix
...
"@access static" isn't a thing
* GrahamForks/access-fix:
"@access static" isn't a thing
2014-12-27 20:24:27 +01:00
Graham Campbell
bd0537fec5
"@access static" isn't a thing
2014-12-27 15:38:14 +00:00
David Anderson
1cd286642e
Change dochint as requested
2014-12-27 14:10:44 +00:00
David Anderson
fba6894474
Add docblock
2014-12-27 14:02:29 +00:00
David Anderson
e9b698fd65
Add callback to SFTP.php
...
Currently, Net_SCP::put() has a callback parameter, allowing the consumer to monitor/log/report progress (or whatever they please).
This patch adds the same feature, working in the same way, to Net_SFTP::put()
2014-12-27 13:55:00 +00:00
Andreas Fischer
471cb1dfb0
Merge pull request #583 from bantu/SSH1UndefinedVariableFix
...
Fix undefined $raw error
* bantu/SSH1UndefinedVariableFix:
Fix undefined $raw error
2014-12-26 10:47:51 +01:00
Clint Nelissen
01d7c96a11
Fix undefined $raw error
2014-12-26 10:37:46 +01:00
terrafrost
1d2a85a319
another fix for 3DES unit test
2014-12-25 10:09:04 -06:00
terrafrost
7ea7463855
fix 3DES unit test
2014-12-25 09:47:36 -06:00
terrafrost
f891410b3d
add 3DES unit test
2014-12-25 03:09:37 -06:00
terrafrost
432700db8f
Tests/RC4: key is already packed
2014-12-21 10:16:37 -06:00
terrafrost
45a5c05da6
Tests: rename tests so that they actually run
2014-12-21 09:54:44 -06:00
terrafrost
7c5e7a0a72
Tests/RC4: engines weren't being set correctly
2014-12-20 13:17:15 -06:00
terrafrost
31dcbc919c
Tests/RC4: add more RC4 test vectors
2014-12-20 12:47:47 -06:00
terrafrost
1e1615080b
Tests/RC4: test updates
2014-12-20 12:24:07 -06:00
terrafrost
b703fbe12b
Tests: add RC4 unit tests
2014-12-20 12:21:17 -06:00
terrafrost
b053ba612b
Merge branch 'master' of https://github.com/phpseclib/phpseclib into openssl-support
2014-12-20 11:54:31 -06:00
terrafrost
f91c4ccf60
DES: apparently TripleDES extends DES
...
this was not always the case:
See c4752cbeba
2014-12-20 11:14:29 -06:00
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