Commit Graph

5225 Commits

Author SHA1 Message Date
terrafrost
d856416026 Merge branch '3.0' 2023-05-27 19:30:15 -05:00
Léon Melis
841267aafa X509::getChain() should always return array of X509 objects
Due to an early exit optimization, X509::getChain() could return currentCert as an array, instead of X509
2023-05-27 19:15:15 -05:00
terrafrost
1b1c073d1e Merge branch '3.0' 2023-05-18 08:24:02 -05:00
terrafrost
2097656b4a
Merge pull request #1912 from thomascorthals/3.0
SFTP typehint fixes
2023-05-18 08:17:52 -05:00
thomascorthals
c71c217fd5 SFTP typehint fixes 2023-05-15 11:15:49 +02:00
terrafrost
32cefb32f8 Merge branch '3.0' 2023-05-10 04:39:34 -05:00
terrafrost
8d0c1a10c7
Merge pull request #1905 from terrafrost/master-openchannel
(master branch) SSH/SFTP: create new openChannel() method to eliminate dupe code
2023-05-10 04:39:06 -05:00
terrafrost
b25206e92b
Merge pull request #1904 from terrafrost/3.0-openchannel
(3.0 branch) SSH/SFTP: create new openChannel() method to eliminate dupe code
2023-05-10 04:38:51 -05:00
terrafrost
8d7cb3a8e3 Merge branch '3.0' 2023-05-10 04:37:10 -05:00
terrafrost
58c2b3a16c Merge branch '2.0' into 3.0 2023-05-10 04:37:03 -05:00
terrafrost
765690c057 Merge branch '1.0' into 2.0 2023-05-10 04:36:56 -05:00
terrafrost
3215afaebb BACKERS: add istiak-tridip. thanks!! 2023-05-10 04:36:30 -05:00
terrafrost
e6f86e1770 Merge branch '3.0-openchannel' into master-openchannel 2023-05-07 11:35:24 -05:00
terrafrost
3dd7779939 SSH2: rm redundant isAuthenticated() call 2023-05-07 11:24:33 -05:00
terrafrost
89d8e6ecbb SFTP: rm redundant code 2023-05-07 11:07:38 -05:00
terrafrost
f664ccb521 SSH2: make exceptions more useful for read() / write() 2023-05-07 11:07:07 -05:00
terrafrost
128d5496b5 Merge branch '3.0' 2023-05-05 07:38:24 -05:00
terrafrost
961034f4c2 SymmetricKey: fix typehint 2023-05-05 07:36:29 -05:00
terrafrost
928b5870b2 Merge branch '3.0' 2023-04-21 15:39:47 -05:00
terrafrost
79b6f96870 SSH2: CS adjustment 2023-04-21 15:39:01 -05:00
terrafrost
21db83aeb7
Merge pull request #1909 from browner12/AB-fputs-failure-message
(3.0 branch) update exception message
2023-04-21 15:33:04 -05:00
Andrew Brown
d4263e854d update exception message
`fputs()` can return `int|false`.  if it fails and `$sent` is `false`, then our exception message looks a little confusing:

> Only  of XXX bytes were sent

This change updates the message to be more descriptive if the `fputs()` fails.
2023-04-18 15:16:18 -05:00
terrafrost
52c85c9935 Merge branch '3.0-openchannel' into master-openchannel 2023-04-15 08:31:37 -05:00
terrafrost
06f45881f9 Tests/SSH2: add more expansive unit test 2023-04-15 08:07:18 -05:00
terrafrost
184a984e97 SSH2: updates to openchannel refactoring 2023-04-14 18:01:20 -05:00
terrafrost
34feefef3d Merge branch '3.0' 2023-04-12 20:58:10 -05:00
terrafrost
8b67d0ac32 Merge branch '2.0' into 3.0 2023-04-12 20:56:23 -05:00
terrafrost
d5d0fca7cf Merge branch '1.0' into 2.0 2023-04-12 20:49:21 -05:00
terrafrost
53f967c36e SFTP: fix NET_SFTP_ATTR_EXTENDED 2023-04-12 20:49:07 -05:00
terrafrost
7d4fa71e9c Merge branch '3.0' 2023-04-10 01:28:25 -05:00
terrafrost
72bd9d99d9 Merge branch 'fixPhpdoc' into 3.0 2023-04-10 01:25:51 -05:00
terrafrost
9a0afb1ae1 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2023-04-09 10:34:30 -05:00
terrafrost
4255b050e3 Merge branch '3.0' 2023-04-09 10:34:05 -05:00
terrafrost
2d1216ba29 Merge branch '2.0' into 3.0 2023-04-09 10:33:57 -05:00
terrafrost
713cd7efb6 Tests/X509: fix malformed base64
base64_decode() handles it just fine but sodium_base642bin() doesn't

e5396968c5 fixed this in the 3.0 branch but not the 2.0 branch

it's an issue in the 2.0 branch because phpseclib2_compat uses the
phpseclib 2.0 unit tests to test a thin wrapper for phpseclib 3.0
2023-04-09 10:29:22 -05:00
terrafrost
1644e8ce34
Merge pull request #1903 from alexander-schranz/patch-1
Fix PHP-CS PrimeFieldTest
2023-03-31 03:47:58 -05:00
terrafrost
fd5054bf95 Tests: CS adjustments 2023-03-31 03:43:58 -05:00
terrafrost
55578577c5 Merge branch '3.0-openchannel' into master-openchannel 2023-03-30 20:52:26 -05:00
terrafrost
5fb084b04c SSH2: if the server doesn't support multiple channels error out 2023-03-29 04:05:41 -05:00
Alexander Schranz
41a5f2c21e
Fix PHP-CS PrimeFieldTest 2023-03-28 11:44:05 +02:00
Vincent Langlet
39bc067417 Fix phpdoc 2023-03-28 09:54:46 +02:00
terrafrost
cecabb1fea SSH/SFTP: create new openChannel() method to eliminate dupe code 2023-03-27 17:46:46 -05:00
terrafrost
e250e6e2f4 Merge branch '3.0' 2023-03-23 13:06:33 -05:00
terrafrost
b799abd1a0 SSH/SFTP: make message numbers / packet types static as well 2023-03-23 13:04:07 -05:00
terrafrost
9705cbbc26 SSH/SFTP: make define_array static 2023-03-23 12:23:43 -05:00
terrafrost
5a208267d6
Merge pull request #1898 from rposky/master
SSH2: Better support for multiple interactive channels & expose shell functions: 3.0 Backport Master Merge
2023-03-23 12:17:26 -05:00
terrafrost
0f8bc61538
Merge pull request #1897 from rposky/3.0
SSH2: Better support for multiple interactive channels & expose shell functions: 3.0 Backport
2023-03-23 12:16:56 -05:00
Robert
53fe071bd2 Merge branch '3.0' 2023-03-16 11:01:21 -05:00
Robert
7ec36fb5d5 Exposed publically open shell method as well as methods to query interactive channel open statuses.
Removed in_request_pty_exec and in_subsystem flags, and removed uses of MASK_SHELL in bitmap, replacing with open channel status queries.
Adding channel argument to read, write, and reset allowing callers to select among multiple open interactive channels.
Adding interactive channel identifier interface as sanctioned path for users to obtain channels ids instead of using channel constants.
Deprecating get_interactive_channel helper and documenting its "legacy" behavior in read, write, and reset doc blocks.
Removing disconnect on timeout in channel close for lack of clarity around timeout origin.
Check for open channel prior to closing in stopSubsystem and reset.
2023-03-16 10:18:03 -05:00
terrafrost
5761a0ba46 Merge branch '3.0' 2023-03-14 21:44:41 -05:00