Commit Graph

1948 Commits

Author SHA1 Message Date
Andreas Fischer
58f8affcad SSH2: Add support for curve25519-sha256@libssh.org.txt via libsodium-php. 2015-07-27 22:58:59 +02:00
Andreas Fischer
27be192189 Merge branch '1.0' into 2.0
* 1.0:
  Add encryption_algorithm_to_key_size method.
2015-07-27 22:08:06 +02: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
7c69f3f866 Merge branch '1.0' into 2.0
* 1.0:
2015-07-21 12:53:36 +02:00
Andreas Fischer
650a4ce266 Merge pull request #748 from terrafrost/ssh-custom-socket-2.0
SSH2: make it so you can connect using open sockets / 2.0 branch

* terrafrost/ssh-custom-socket-2.0:
  SSH2: move where $host is defined
  SSH2: make it so you can connect using open sockets
2015-07-21 12:53:32 +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
713a9c7ccf Merge branch '1.0' into 2.0
* 1.0:
  SSH2: Introduce _array_intersect_first function.

Conflicts:
	phpseclib/Net/SSH2.php
2015-07-18 01:06:09 +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
690704d36e Merge branch 'ssh-custom-socket-1.0' into ssh-custom-socket-2.0
Conflicts:
	phpseclib/Net/SSH2.php
2015-07-17 13:11:57 -05:00
terrafrost
a19e2a0d21 SSH2: move where $host is defined 2015-07-17 13:08:24 -05:00
terrafrost
4d086bee86 Merge branch 'ssh-custom-socket-1.0' into ssh-custom-socket-2.0
Conflicts:
	phpseclib/Net/SSH2.php
2015-07-17 12:43:50 -05:00
terrafrost
33a97391bc SSH2: make it so you can connect using open sockets 2015-07-17 12:30:44 -05:00
Andreas Fischer
4a0b974a6c Merge branch '1.0' into 2.0
* 1.0:
2015-07-17 15:16:31 +02:00
Andreas Fischer
8f43067d92 Merge pull request #744 from bantu/PSR2-2.0
[2.0] Code Sniffer: Switch from PEAR with exceptions to PSR2 with exception2

* bantu/PSR2-2.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:24 +02: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
d9e9504fba Merge branch 'PSR2-1.0' into PSR2-2.0
* 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

Conflicts:
	build/code-sniffer-ruleset-tests.xml
	build/code-sniffer-ruleset.xml
	composer.lock
	phpseclib/Crypt/DES.php
	phpseclib/Crypt/Hash.php
	phpseclib/Crypt/RSA.php
	phpseclib/File/X509.php
	phpseclib/Math/BigInteger.php
	phpseclib/Net/SFTP.php
	phpseclib/Net/SSH1.php
	phpseclib/Net/SSH2.php
	tests/Functional/Net/SFTPUserStoryTest.php
	tests/Unit/Crypt/TwofishTest.php
2015-07-17 13:41:59 +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
4b5cc0c286 Merge branch '1.0' into 2.0
* 1.0:
  SFTP: stat cache updates
2015-07-17 12:45:42 +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
3fbd30eab6 Merge branch '1.0' into 2.0
* 1.0:
2015-07-17 12:31:13 +02:00
Andreas Fischer
feea435071 Merge pull request #741 from terrafrost/x509-serialnumber-2.0
X509: use a random serial number for 2.0 branch

* terrafrost/x509-serialnumber-2.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:31:10 +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
6cbe537ba6 Merge branch '1.0' into 2.0
* 1.0:
  SSH2: limit the size of data that expect() looks at

Conflicts:
	phpseclib/Net/SSH2.php
2015-07-17 11:17:32 +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
365c687f04 Merge branch 'x509-serialnumber-1.0' into x509-serialnumber-2.0
Conflicts:
	phpseclib/File/X509.php
2015-07-17 00:53:45 -05:00
terrafrost
0d3a117608 X509: add a comment to explain the bitmask 2015-07-17 00:45:20 -05:00
terrafrost
ee619e8f47 Merge branch 'x509-serialnumber-1.0' into x509-serialnumber-2.0
Conflicts:
	phpseclib/File/X509.php
2015-07-16 11:53:15 -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
f2773847a2 Merge branch '1.0' into 2.0
* 1.0:
  Add support for RFC 4419: diffie-hellman-group-exchange-sha{1,256}

Conflicts:
	phpseclib/Net/SSH2.php
2015-07-08 15:45:53 +02: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
f782005a3f Merge branch '1.0' into 2.0
* 1.0:
  SFTP: don't update stat cache when it's been disabled
2015-07-06 23:48:28 +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
4114e06b1b Merge branch '1.0' into 2.0
* 1.0:
  Scrutinizer CI: Unconfigure external code coverage. This keeps timing out.
2015-07-06 23:44:33 +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
83cac3385b Merge branch '1.0' into 2.0
* 1.0:
  SFTP: update how recursive delete's update stat cache
  Tests/SFTP: add unit test
2015-07-06 23:38:10 +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