Commit Graph

1557 Commits

Author SHA1 Message Date
Andreas Fischer
e08e2fd300 Merge pull request #791 from cweagans/switch-to-extension-loaded-1.0
Switch to extension loaded (1.0)

* cweagans/switch-to-extension-loaded-1.0:
  Remove unnecessary parens
  Convert most instances of function_exists() to extension_loaded() where applicable
2015-09-04 15:04:17 +02:00
Cameron Eagans
8206061a30 Remove unnecessary parens 2015-09-02 15:22:37 -04:00
Andreas Fischer
e1bd0dfaf5 Merge pull request #801 from GrahamForks/1.0-phpdoc
[1.0] PHPDoc Fixes

* GrahamForks/1.0-phpdoc:
  Fixed lots of phpdoc typos
  Fixed invalid param phpdoc
2015-09-02 20:43:38 +02:00
Andreas Fischer
04e68212fe Merge pull request #789 from terrafrost/oid-changes
X509: add getOID() method

* terrafrost/oid-changes:
  X509: updates to getOID() as suggested by bantu
  X509: add getOID() method
2015-09-02 15:05:53 +02:00
Andreas Fischer
bdd6159d82 Merge pull request #797 from GrahamCampbell/patch-1
[1.0] Test on php 5.5.9 too

* GrahamCampbell/patch-1:
  Test on php 5.5.9 too
2015-09-02 14:52:44 +02:00
Graham Campbell
cd0e10cf9d Fixed lots of phpdoc typos 2015-09-02 00:37:54 +01:00
Graham Campbell
5890f3da98 Fixed invalid param phpdoc 2015-09-02 00:22:30 +01:00
Graham Campbell
429f08a4f4 Test on php 5.5.9 too 2015-09-01 23:12:58 +01:00
Cameron Eagans
2b75c37cc9 Convert most instances of function_exists() to extension_loaded() where applicable 2015-09-01 14:32:22 -04:00
terrafrost
abbee318cc X509: updates to getOID() as suggested by bantu 2015-08-31 15:20:38 -05:00
terrafrost
d7d9d782b0 X509: add getOID() method 2015-08-29 22:15:04 -05:00
Andreas Fischer
e391fdbd27 Merge pull request #772 from terrafrost/x509_unit_test
Tests/X509: add unit test showing need for return by reference

* terrafrost/x509_unit_test:
  Tests/X509: add unit test showing need for return by reference
2015-08-24 14:01:41 +02:00
Andreas Fischer
f7f93961a5 Merge pull request #780 from bantu/scrutinizer-comment-removal-travis-yml
.travis.yml: Remove outdated comment about .scrutinizer.yml

* bantu/scrutinizer-comment-removal-travis-yml:
  .travis.yml: Remove outdated comment about .scrutinizer.yml
2015-08-18 11:40:56 -04:00
Andreas Fischer
de896a7169 .travis.yml: Remove outdated comment about .scrutinizer.yml 2015-08-18 00:36:36 -04:00
Andreas Fischer
fe8fc0701b Merge pull request #769 from terrafrost/pss-fix
RSA: fix regression for PSS signatures

* terrafrost/pss-fix:
  Tests/RSA: add PSS test
  RSA: fix regression for PSS signatures
2015-08-13 14:34:43 -04:00
terrafrost
a56e0daf07 Tests/X509: add unit test showing need for return by reference 2015-08-13 10:22:01 -05:00
terrafrost
f591962fc4 Tests/RSA: add PSS test 2015-08-11 11:47:19 -05:00
terrafrost
15c9f99721 RSA: fix regression for PSS signatures 2015-08-11 07:27:56 -05:00
Andreas Fischer
ee16fd44ce Merge pull request #754 from bantu/ssh2-function-key_exchange-reduction
[1.0] SSH2: Add encryption_algorithm_to_key_size method.

* bantu/ssh2-function-key_exchange-reduction:
  Add encryption_algorithm_to_key_size method.
2015-07-27 22:08:06 +02:00
Andreas Fischer
65010d08e6 Add encryption_algorithm_to_key_size method. 2015-07-24 12:31:50 +02:00
Andreas Fischer
06ec04e3fe Merge pull request #746 from terrafrost/ssh-custom-socket-1.0
SSH2: make it so you can connect using open sockets / 1.0 branch

* terrafrost/ssh-custom-socket-1.0:
  SSH2: move where $host is defined
  SSH2: make it so you can connect using open sockets
2015-07-21 12:53:24 +02:00
Andreas Fischer
a627caf691 Merge pull request #745 from bantu/array_intersect_first
SSH2: Introduce _array_intersect_first function.

* bantu/array_intersect_first:
  SSH2: Introduce _array_intersect_first function.
2015-07-18 01:05:33 +02:00
Andreas Fischer
1473da35e6 SSH2: Introduce _array_intersect_first function.
+ No more empty for-loop bodies
+ No more counting variables $i leaked into outer context
+ No more unintuitive $i == count(...) comparisons
+ No more array / hash table access of the form $kex_algorithms[$i]
- Function call overhead; not in the performance critical path, though.
2015-07-17 22:28:32 +02:00
terrafrost
a19e2a0d21 SSH2: move where $host is defined 2015-07-17 13:08:24 -05:00
terrafrost
33a97391bc SSH2: make it so you can connect using open sockets 2015-07-17 12:30:44 -05:00
Andreas Fischer
e251f6c372 Merge pull request #732 from bantu/PSR2-1.0
[1.0] Code Sniffer: Switch from PEAR with exceptions to PSR2 with exceptions

* bantu/PSR2-1.0:
  Fix indentation phpcbf did not fix.
  Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception.
  Use phpcbf to fix PHP code to ruleset.
  Ignore coding guidelines in ANSI switch block.
  Base code sniffer ruleset on PSR2 rather than PEAR.
  Update PHP Code Sniffer to 2.3.3
2015-07-17 15:16:13 +02:00
Andreas Fischer
847082ac74 Fix indentation phpcbf did not fix. 2015-07-17 12:57:41 +02:00
Andreas Fischer
5eb205b237 Remove PSR2.Methods.FunctionCallSignature.SpaceAfterOpenBracket exception. 2015-07-17 12:57:41 +02:00
Andreas Fischer
2013a31ecd Use phpcbf to fix PHP code to ruleset. 2015-07-17 12:57:41 +02:00
Andreas Fischer
6c76df46d4 Ignore coding guidelines in ANSI switch block. 2015-07-17 12:57:05 +02:00
Andreas Fischer
9283aaa36b Base code sniffer ruleset on PSR2 rather than PEAR. 2015-07-17 12:57:04 +02:00
Andreas Fischer
00f17aa956 Update PHP Code Sniffer to 2.3.3 2015-07-17 12:57:04 +02:00
Andreas Fischer
4da73ea6b4 Merge pull request #743 from bantu/sftp-stat-vs-lstat-fix
SFTP: stat cache updates

* bantu/sftp-stat-vs-lstat-fix:
  SFTP: stat cache updates
2015-07-17 12:45:42 +02:00
terrafrost
862b63e9e5 SFTP: stat cache updates 2015-07-17 12:34:56 +02:00
Andreas Fischer
12ccc402b1 Merge pull request #740 from terrafrost/x509-serialnumber-1.0
X509: use a random serial number for 1.0 branch

* terrafrost/x509-serialnumber-1.0:
  X509: add a comment to explain the bitmask
  X509: move where Crypt/Random loading is done
  X509: use a random serial number
2015-07-17 12:30:53 +02:00
Andreas Fischer
6a80da4c87 Merge pull request #737 from terrafrost/limit-preg-match-1.0
SSH2: limit the size of data that expect() looks at

* terrafrost/limit-preg-match-1.0:
  SSH2: limit the size of data that expect() looks at
2015-07-17 11:06:18 +02:00
terrafrost
0d3a117608 X509: add a comment to explain the bitmask 2015-07-17 00:45:20 -05:00
terrafrost
693804e62a X509: move where Crypt/Random loading is done 2015-07-16 11:50:22 -05:00
terrafrost
374f8db2e3 X509: use a random serial number 2015-07-16 11:31:20 -05:00
terrafrost
4dc79b96ed SSH2: limit the size of data that expect() looks at 2015-07-14 19:05:52 -05:00
Andreas Fischer
cdda621903 Merge pull request #714 from bantu/diffie-hellman-group-exchange-sha256
Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256}

* bantu/diffie-hellman-group-exchange-sha256:
  Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256}
2015-07-08 15:43:46 +02:00
Andreas Fischer
abeda5237f Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256} 2015-07-08 00:00:40 +02:00
Andreas Fischer
7f1dfba50d Merge pull request #730 from terrafrost/disable-stat-cache-1.0
SFTP: don't update stat cache when it's been disabled

* terrafrost/disable-stat-cache-1.0:
  SFTP: don't update stat cache when it's been disabled
2015-07-06 23:48:28 +02:00
Andreas Fischer
cd2ecfa0d7 Merge pull request #728 from bantu/scrutinizer-coverage-disable
Scrutinizer CI: Unconfigure external code coverage. This keeps timing out.

* bantu/scrutinizer-coverage-disable:
  Scrutinizer CI: Unconfigure external code coverage. This keeps timing out.
2015-07-06 23:44:33 +02:00
Andreas Fischer
643103449c Merge pull request #731 from terrafrost/sftp-recur-delete-stat-cache-1.0
SFTP: delete stat cache for recursive deletes / 1.0 branch

* terrafrost/sftp-recur-delete-stat-cache-1.0:
  SFTP: update how recursive delete's update stat cache
  Tests/SFTP: add unit test
2015-07-06 23:37:55 +02:00
terrafrost
c460e511a0 SFTP: update how recursive delete's update stat cache 2015-07-04 13:09:26 -05:00
terrafrost
52aeb2ea3f Tests/SFTP: add unit test 2015-07-04 12:57:50 -05:00
terrafrost
109ae38e48 SFTP: don't update stat cache when it's been disabled 2015-07-04 12:19:35 -05:00
Andreas Fischer
727677d4e1 Merge pull request #713 from bantu/SFTPStreamTest
[1.0] Various fixes to fopen mode handling in SFTP Stream

* bantu/SFTPStreamTest:
  Explicitly set size to 0 when creating or truncating.
  mode[0] of 'c' is not supposed to truncate.
  Need to create the file when it does not exist and mode[0] is not 'r'.
  Add SFTPStreamTest::testFopenFcloseCreatesFile()
2015-07-04 14:28:06 +02:00
Andreas Fischer
5a3315ad54 Scrutinizer CI: Unconfigure external code coverage. This keeps timing out. 2015-07-04 02:04:21 +02:00