Commit Graph

5348 Commits

Author SHA1 Message Date
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
Steven Hetland
abbc1ab7c7 ASN1: 3.0 decodeBER() was optimized to remove duplicate work.
decodeBER() now runs twice as fast.
2023-03-14 21:43:29 -05:00
terrafrost
b49396a370 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2023-03-06 06:48:07 -06:00
terrafrost
cb49bd3fb2 Merge branch '3.0' 2023-03-06 06:47:18 -06:00
terrafrost
5ab7f86739 Merge branch '2.0' into 3.0 2023-03-06 06:46:54 -06:00
terrafrost
665d289f59 CHANGELOG: add 2.0.42 release 2023-03-06 06:45:53 -06:00
terrafrost
45c9910a1e
Merge pull request #1892 from alexislefebvre/patch-1
README: link on CI badge leads to the results
2023-03-06 06:06:20 -06:00
Alexis Lefebvre
2e7da76e9a
README: link on CI badge leads to the results 2023-03-06 11:37:33 +01:00
terrafrost
f3db3de295 Merge branch '3.0' 2023-03-05 11:13:22 -06:00
terrafrost
cc181005cf CHANGELOG: add 3.0.19 release 2023-03-05 11:13:09 -06:00
terrafrost
b9e27cd910 Merge branch '3.0' 2023-03-05 11:09:48 -06:00
terrafrost
cee5587120 add unit test for primefield infinite loop 2023-03-05 11:04:55 -06:00
terrafrost
b03e953b6c fix bad merge 2023-03-05 10:21:32 -06:00
terrafrost
e9596cef8c Merge branch '3.0' 2023-03-05 10:11:53 -06:00
terrafrost
0f6e1c2218 PKCS8: fix public private checks for human readable keys 2023-03-05 10:01:22 -06:00
terrafrost
96e49a5e51 Merge branch '3.0' 2023-03-05 07:06:44 -06:00
terrafrost
aff0e68f54 Merge branch '2.0' into 3.0 2023-03-05 07:04:39 -06:00
terrafrost
8339322eb9 Tests/SSH2: CS adjustment 2023-03-05 06:55:50 -06:00
terrafrost
7ce104b12c Merge branch '1.0' into 2.0 2023-03-05 04:18:37 -06:00
terrafrost
34d00869e5 SSH2: backport getTimeout() 2023-03-05 04:07:26 -06:00
terrafrost
79dead6a5e CS adjustments 2023-03-05 00:09:02 -06:00
terrafrost
60358cefb1 Merge branch '3.0' 2023-03-04 23:31:30 -06:00
terrafrost
cf69b29427 Crypt/PKCS8: rm duplicate code and improve detection of public keys 2023-03-04 23:25:36 -06:00
terrafrost
b9996fda00 Tests/EC: add unit test for naked PKCS8 public key 2023-03-04 22:14:46 -06:00
terrafrost
617b096223 Merge branch '3.0' 2023-03-04 21:01:15 -06:00
terrafrost
9a356ba200 Merge branch 'rposky' 2023-03-04 21:00:14 -06:00
terrafrost
71b9b64203 CS adjustments 2023-03-04 20:47:49 -06:00
terrafrost
ea0a2375d2 Merge branch '3.0' 2023-03-03 14:55:02 -06:00