Andreas Fischer
7a6369ca24
Merge pull request #616 from bantu/sami-branches
...
Adjust sami.conf.php to new branch names.
* bantu/sami-branches:
Adjust sami.conf.php to new branch names.
2015-02-04 18:16:50 +01:00
Andreas Fischer
51580c0cb7
Adjust sami.conf.php to new branch names.
2015-02-04 16:53:39 +01:00
Andreas Fischer
d15bba1edc
Merge pull request #315 from bantu/php5.3.3-ssh-functional-tests-reenable
...
Reenable SSH Functional Test on Travis CI PHP 5.3.3 and below.
* bantu/php5.3.3-ssh-functional-tests-reenable:
Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below).
2015-01-28 22:50:33 +01:00
Andreas Fischer
d8742488f6
Merge pull request #612 from bantu/scrutinizer-timeout
...
.scrutinizer.yml: Use large timeout to prevent coverage receiver from ti...
* bantu/scrutinizer-timeout:
.scrutinizer.yml: Use large timeout to prevent coverage receiver from timing out.
2015-01-28 16:21:58 +01:00
Andreas Fischer
c9c68c9ca2
.scrutinizer.yml: Use large timeout to prevent coverage receiver from timing out.
2015-01-28 14:36:11 +01:00
Andreas Fischer
f908040d20
Reenable SSH Functional Tests on Travis CI (PHP 5.3.3 and below).
2015-01-28 13:37:21 +01:00
Andreas Fischer
fd6aa5258c
Merge pull request #606 from terrafrost/asn-csr-2
...
ASN1 / CSR fixes
* terrafrost/asn-csr-2:
ASN1: empty constructed context-specific tags error'd out
2015-01-11 16:05:19 +01:00
terrafrost
84325d415e
ASN1: empty constructed context-specific tags error'd out
...
eg. an attributes field in a CSR that's blank
2015-01-10 23:58:50 -06:00
Andreas Fischer
09ccfdbcb9
Merge pull request #598 from haphan/master
...
(OpenSSL Big integer) Only require major version to match
* haphan/master:
Compare numeric part of OpenSSL version
2015-01-09 13:08:59 +01:00
Ha Phan
b0129e9125
Compare numeric part of OpenSSL version
2015-01-08 20:55:14 +07:00
Andreas Fischer
3c99773184
Merge pull request #588 from terrafrost/disconnect-fix
...
SSH2: update conditions under which _disconnect's code is executed
* terrafrost/disconnect-fix:
SSH2: update conditions under which _disconnect's code is executed
2015-01-04 11:57:52 +01:00
terrafrost
472e006b6c
SSH2: update conditions under which _disconnect's code is executed
2014-12-29 08:37:44 -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
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
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
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
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
Graham Campbell
91511b7c5c
Updated dependencies
2014-12-02 21:25:47 +00:00
Andreas Fischer
6445e58bc0
Merge pull request #516 from bantu/dev-deps-update
...
Update development dependencies
* bantu/dev-deps-update:
Update squizlabs/php_codesniffer from 1.5.2 to 1.5.5
Update phpunit/phpunit to 4.3.*
Update sami/sami to 2.*
2014-12-02 21:39:41 +01:00
Andreas Fischer
420653a0a6
Update squizlabs/php_codesniffer from 1.5.2 to 1.5.5
2014-12-02 21:27:35 +01:00