1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-13 01:27:40 +01:00
Commit Graph

1941 Commits

Author SHA1 Message Date
terrafrost
df65acb999 Tests/SFTP: just check to see that stat / lstat return an array 2015-06-27 07:43:35 -05:00
terrafrost
d1d415618a SFTP: update conditions under which cache for lstat / . is used 2015-06-26 23:34:14 -05:00
terrafrost
26818ebb40 Tests/SFTP: add test for stat's on . 2015-06-26 22:25:22 -05:00
Andreas Fischer
c66d553835 Merge branch '2.0'
* 2.0:
  Increase the external_code_coverage timeout even more. Still timing out.
2015-06-25 14:34:21 +02:00
Andreas Fischer
a189767e75 Merge branch '1.0' into 2.0
* 1.0:
  Increase the external_code_coverage timeout even more. Still timing out.
2015-06-25 14:34:04 +02:00
Andreas Fischer
92a7f74d8a Merge pull request #715 from bantu/scrutinizer-timeout-3h
Increase the external_code_coverage timeout even more. Still timing out.

* bantu/scrutinizer-timeout-3h:
  Increase the external_code_coverage timeout even more. Still timing out.
2015-06-25 14:33:55 +02:00
Andreas Fischer
d71da6b02b Explicitly set size to 0 when creating or truncating. 2015-06-25 14:26:35 +02:00
Andreas Fischer
9e07fb704b mode[0] of 'c' is not supposed to truncate. 2015-06-25 14:24:58 +02:00
Andreas Fischer
f0957021a1 Need to create the file when it does not exist and mode[0] is not 'r'. 2015-06-25 14:24:18 +02:00
Andreas Fischer
01f547ba17 Add SFTPStreamTest::testFopenFcloseCreatesFile() 2015-06-25 14:05:18 +02:00
Andreas Fischer
acfaeb5ba6 Increase the external_code_coverage timeout even more. Still timing out. 2015-06-25 12:08:34 +02:00
terrafrost
c0555581e7 SSH2: fix for window sizes > 2,147,483,648 2015-06-24 23:45:14 -05:00
Andreas Fischer
d098568e4f Merge branch '2.0'
* 2.0:
  Unit/X509/CSR: looks like a line got overwritten..
  SFTP: stat cache updates
2015-06-22 01:19:33 +02:00
Andreas Fischer
0aa4cb174c Merge branch '1.0' into 2.0
* 1.0:
2015-06-22 01:19:28 +02:00
Andreas Fischer
94d0d79dca Merge pull request #710 from terrafrost/stat-cache-fix-2.0
SFTP: stat cache updates for 2.0

* terrafrost/stat-cache-fix-2.0:
  Unit/X509/CSR: looks like a line got overwritten..
  SFTP: stat cache updates
2015-06-22 01:19:22 +02:00
Andreas Fischer
6789b945d0 Merge pull request #709 from terrafrost/stat-cache-fix-1.0
SFTP: stat cache updates

* terrafrost/stat-cache-fix-1.0:
  SFTP: stat cache updates
2015-06-22 01:18:57 +02:00
terrafrost
26059aa444 Merge branch '2.0' of git://github.com/phpseclib/phpseclib into stat-cache-fix-2.0 2015-06-20 21:15:55 -05: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
8cb1ef2e9b Merge branch '2.0'
* 2.0:
  Tests/X509: PHP5 adjustments
  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:31:26 +02:00
Andreas Fischer
014b26b44d Merge branch '1.0' into 2.0
* 1.0:
2015-06-16 16:31:17 +02:00
Andreas Fischer
ecdd97f8a8 Merge pull request #702 from terrafrost/asn1-fix-2.0
ASN1 parsing fix for issue mainly effecting CSR's for 2.0 branch

* terrafrost/asn1-fix-2.0:
  Tests/X509: PHP5 adjustments
  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:46 +02: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
707731305b Merge branch '2.0'
* 2.0:
  RC4: re-add the OpenSSL changes for RC4
2015-06-10 22:51:32 +02:00
Andreas Fischer
76c5cedbf9 Merge pull request #704 from terrafrost/openssl-rc4
RC4: re-add the OpenSSL changes for RC4

* terrafrost/openssl-rc4:
  RC4: re-add the OpenSSL changes for RC4
2015-06-10 22:51:25 +02:00
terrafrost
4e5ca26342 RC4: re-add the OpenSSL changes for RC4
looks like they got skipped over when the merge conflict was resolved
2015-06-10 07:10:03 -05:00
Andreas Fischer
8bb48f3adf Merge branch '2.0'
* 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:26 +02:00
Andreas Fischer
ea4822c333 Merge branch '1.0' into 2.0
* 1.0:
2015-06-09 17:19:18 +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
Andreas Fischer
8a9bf27242 Merge branch '2.0'
* 2.0:
  composer.json: update PHP_Compat requirements
  ANSI: use default namespace for stdClass
  ANSI: PHP5 updates
  Tests: add ANSI unit test
  ANSI: fix typo
  ANSI: rendering improvements
  ANSI: improve vt100 terminal emulation
2015-06-07 17:51:21 +02:00
Andreas Fischer
5dd807ea5f Merge branch '1.0' into 2.0
* 1.0:
  composer.json: update PHP_Compat requirements

Conflicts:
	composer.json
2015-06-07 17:49:35 +02:00
Andreas Fischer
496c8f9476 Merge pull request #690 from terrafrost/ansi-updates-2.0
ANSI updates for 2.0 branch

* terrafrost/ansi-updates-2.0:
  ANSI: use default namespace for stdClass
  ANSI: PHP5 updates
  Tests: add ANSI unit test
  ANSI: fix typo
  ANSI: rendering improvements
  ANSI: improve vt100 terminal emulation
2015-06-07 17:48:51 +02:00
Andreas Fischer
fcf74f3e6b Merge pull request #689 from terrafrost/ansi-updates-1.0
ANSI updates for 1.0 branch

* terrafrost/ansi-updates-1.0:
  composer.json: update PHP_Compat requirements
  Tests: add ANSI unit test
  ANSI: fix typo
  ANSI: rendering improvements
  ANSI: improve vt100 terminal emulation
2015-06-07 17:47:00 +02:00
terrafrost
49ee6d7fd2 Tests/X509: PHP5 adjustments 2015-06-07 10:30:55 -05:00
terrafrost
22b10c6a3a Merge branch 'asn1-fix-1.0' into asn1-fix-2.0 2015-06-07 10:24:11 -05:00
terrafrost
11000a93b9 ASN1: handle malformed input better 2015-06-07 09:59:13 -05:00
terrafrost
1ecd006685 Tests/X509/CSR: add unit test for ASN1 changes 2015-06-04 23:08:55 -05:00
terrafrost
d3a5398fe4 ASN1: constructed context-specific tags can have x sub elements
previously it only worked for when there was one sub element.
2015-06-03 23:48:43 -05:00
terrafrost
da5980131e Merge branch 'rsa-none-1.0' into rsa-none-2.0
Conflicts:
	tests/Unit/Crypt/RSA/ModeTest.php
2015-05-31 10:24:42 -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
1395c0c011 Merge branch 'rsa-none-1.0' into rsa-none-2.0 2015-05-31 02:21:04 -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