octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-26 03:27:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,924 Commits 4 Branches 123 Tags 21 MiB
4b5cc0c286
Commit Graph

1924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andreas Fischer
ac91bcabdd Merge branch '1.0' into 2.0 
* 1.0:
 2015-07-04 14:28:17 +02:00
Andreas Fischer
4724249f50 Merge pull request #727 from bantu/SFTPStreamTest-2.0 
[2.0] Various fixes to fopen mode handling in SFTP Stream

* bantu/SFTPStreamTest-2.0:
  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:15 +02: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
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
Andreas Fischer
61af2be8f9 Merge pull request #723 from terrafrost/x509-null-1.0 
set signaturealgorithm parameters field to null / 1.0 branch

* terrafrost/x509-null-1.0:
  X509: set one more parameter to null
  X509: set another parameters field to null
 2015-06-30 12:27:05 +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
Andreas Fischer
28fc06e2cc Merge branch '1.0' into 2.0 
* 1.0:
 2015-06-29 10:31:34 +02:00
Andreas Fischer
15fecbd7ef Merge pull request #722 from terrafrost/x509-rsa-null-2.0-2 
parameter field should be null for RSA keys in X509 certs / fix for 2.0 branch

* terrafrost/x509-rsa-null-2.0-2:
  Tests/X509: CS adjustments
  Tests/X509: typo
  X509: set parameter field to null for RSA keys
 2015-06-29 10:31:06 +02:00
Andreas Fischer
e0690f6b23 Merge pull request #721 from terrafrost/x509-rsa-null-1.0 
parameter field should be null for RSA keys in X509 certs / fix for 1.0 branch

* terrafrost/x509-rsa-null-1.0:
  Tests/X509: CS adjustments
  Tests/X509: typo
  X509: set parameter field to null for RSA keys
 2015-06-29 10:30:56 +02: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
Andreas Fischer
1ad66ad1ea Merge pull request #719 from terrafrost/lstat-fix-1.0 
SFTP: update conditions under which cache for lstat / . is used for 1.0 branch

* terrafrost/lstat-fix-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
Andreas Fischer
89cf423c58 Merge branch '1.0' into 2.0 
* 1.0:
  SSH2: fix for window sizes > 2,147,483,648
 2015-06-27 21:58:45 +02:00
Andreas Fischer
e956acd851 Merge pull request #717 from terrafrost/neg_window_size_fix-1.0 
SSH2: fix for window sizes > 2,147,483,648 for 1.0 branch

* terrafrost/neg_window_size_fix-1.0:
  SSH2: fix for window sizes > 2,147,483,648
 2015-06-27 21:58: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
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