Commit Graph

356 Commits

Author SHA1 Message Date
Cameron Eagans
a84699a346 Switch to extension_loaded instead of function_exists where it makes sense 2015-09-01 14:22:12 -04:00
Andreas Fischer
0f1d043428 Merge branch '1.0' into 2.0
* 1.0:
  Tests/X509: add unit test showing need for return by reference
2015-08-24 14:02:39 +02: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
af939f9aa5 Make paths to runkit_import() absolute due to lack of include path. 2015-08-18 00:00:47 -04:00
Andreas Fischer
785b37b505 Remove include statement from BigInteger TestCase.
This was previously required to load MATH_BIGINTEGER_MODE_* constants, but
these are autoloadable via \phpseclib\Math\BigInteger::MODE_* now and the
include path was removed.
2015-08-13 15:12:20 -04:00
Andreas Fischer
54a1aeeefe Merge branch '1.0' into 2.0
* 1.0:
  Tests/RSA: add PSS test
  RSA: fix regression for PSS signatures
2015-08-13 14:37:15 -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
Andreas Fischer
58f8affcad SSH2: Add support for curve25519-sha256@libssh.org.txt via libsodium-php. 2015-07-27 22:58:59 +02: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
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
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
4b5cc0c286 Merge branch '1.0' into 2.0
* 1.0:
  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
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
52aeb2ea3f Tests/SFTP: add unit test 2015-07-04 12:57:50 -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
ba46db1758 Merge pull request #713 from bantu/SFTPStreamTest
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()

Conflicts:
	tests/Functional/Net/SFTPLargeFileTest.php
2015-07-04 01:18:19 +02:00
Andreas Fischer
483c253879 Merge branch '1.0' into 2.0
* 1.0:
  X509: set one more parameter to null
  X509: set another parameters field to null
2015-06-30 12:27:06 +02:00
terrafrost
77c757d095 X509: set one more parameter to null 2015-06-29 22:10:18 -05:00
terrafrost
6c2798be90 X509: set another parameters field to null 2015-06-29 21:53:27 -05:00
terrafrost
815f443ed1 Merge branch 'x509-rsa-null-1.0' into x509-rsa-null-2.0-2
Conflicts:
	tests/Unit/File/X509/X509Test.php
2015-06-28 16:10:40 -05:00
terrafrost
2c8cb0b426 Tests/X509: CS adjustments 2015-06-28 14:52:07 -05:00
terrafrost
2277c0fbac Tests/X509: typo 2015-06-28 11:40:34 -05:00
terrafrost
46a3c0fbbb X509: set parameter field to null for RSA keys 2015-06-28 11:32:42 -05:00
Andreas Fischer
e1dd7e9d69 Merge branch '1.0' into 2.0
* 1.0:
  Tests/SFTP: $lstat->$stat
  Tests/SFTP: just check to see that stat / lstat return an array
  SFTP: update conditions under which cache for lstat / . is used
  Tests/SFTP: add test for stat's on .
2015-06-27 21:59:45 +02:00
terrafrost
fb3bd8adff Tests/SFTP: $lstat->$stat 2015-06-27 07:56:47 -05:00
terrafrost
df65acb999 Tests/SFTP: just check to see that stat / lstat return an array 2015-06-27 07:43:35 -05:00
terrafrost
26818ebb40 Tests/SFTP: add test for stat's on . 2015-06-26 22:25:22 -05:00
Andreas Fischer
01f547ba17 Add SFTPStreamTest::testFopenFcloseCreatesFile() 2015-06-25 14:05:18 +02:00
terrafrost
5385104d2c Unit/X509/CSR: looks like a line got overwritten.. 2015-06-20 20:46:30 -05:00
terrafrost
4d82df3fc7 Merge branch 'stat-cache-fix-1.0' into stat-cache-fix-2.0
Conflicts:
	tests/Functional/Net/SFTPUserStoryTest.php
2015-06-20 19:59:48 -05:00
terrafrost
6bc3513914 SFTP: stat cache updates 2015-06-20 19:33:19 -05:00
Andreas Fischer
a79b4ac6ad Merge pull request #699 from terrafrost/asn1-fix-1.0
ASN1 parsing fix for issue mainly effecting CSR's for 1.0 branch

* terrafrost/asn1-fix-1.0:
  ASN1: handle malformed input better
  Tests/X509/CSR: add unit test for ASN1 changes
  ASN1: constructed context-specific tags can have x sub elements
2015-06-16 16:30:35 +02:00
Andreas Fischer
902e41a2a4 Merge pull request #693 from terrafrost/rsa-none-2.0
add "none" encryption mode for 2.0 branch

* terrafrost/rsa-none-2.0:
  Tests/RSA: pack expected result
  Tests/RSA: pack expected result
  Tests/RSA: re-added accidentally removed $rsa initialization
  Tests/RSA: use correct constant
  Tests/RSA: fix error
  Tests/RSA: hard-coded key and result
  RSA: add "none" encryption mode
2015-06-09 17:19:16 +02:00
Andreas Fischer
956607d4e0 Merge pull request #692 from terrafrost/rsa-none-1.0
add "none" encryption mode for 1.0 branch

* terrafrost/rsa-none-1.0:
  Tests/RSA: pack expected result
  Tests/RSA: re-added accidentally removed $rsa initialization
  Tests/RSA: fix error
  Tests/RSA: hard-coded key and result
  RSA: add "none" encryption mode
2015-06-09 17:18:47 +02:00
terrafrost
1ecd006685 Tests/X509/CSR: add unit test for ASN1 changes 2015-06-04 23:08:55 -05:00
terrafrost
ab489801fe Tests/RSA: pack expected result 2015-05-31 10:07:18 -05:00
terrafrost
2536d224ee Tests/RSA: pack expected result 2015-05-31 10:06:13 -05:00
terrafrost
6bce2c79ac Tests/RSA: re-added accidentally removed $rsa initialization 2015-05-31 09:20:03 -05:00
terrafrost
1316fd45f4 Tests/RSA: use correct constant 2015-05-31 09:17:53 -05:00
terrafrost
0166d3a7ec Tests/RSA: fix error 2015-05-31 02:20:16 -05:00
terrafrost
71104e8120 Merge branch 'rsa-none-1.0' into rsa-none-2.0
Conflicts:
	tests/Unit/Crypt/RSA/ModeTest.php
2015-05-31 02:19:06 -05:00
terrafrost
26d528855a Tests/RSA: hard-coded key and result 2015-05-31 02:13:11 -05:00
terrafrost
30260f3321 Merge branch 'rsa-none-1.0' into rsa-none-2.0
Conflicts:
	phpseclib/Crypt/RSA.php
2015-05-25 22:36:10 -05:00
terrafrost
1d924cfc7b RSA: add "none" encryption mode 2015-05-25 22:30:38 -05:00
terrafrost
6c345acc1d ANSI: PHP5 updates 2015-05-23 18:23:40 -05:00