Commit Graph

731 Commits

Author SHA1 Message Date
terrafrost
501c96c48c Merge branch '3.0' 2023-06-04 10:51:36 -05:00
terrafrost
e6dd9f6492 Merge branch '3.0' 2023-06-02 10:25:13 -05:00
terrafrost
f418be845b RSA: setting sig padding broke enc padding and vice versa 2023-06-02 10:14:58 -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
52c85c9935 Merge branch '3.0-openchannel' into master-openchannel 2023-04-15 08:31:37 -05:00
terrafrost
184a984e97 SSH2: updates to openchannel refactoring 2023-04-14 18:01:20 -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
fd5054bf95 Tests: CS adjustments 2023-03-31 03:43:58 -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
cb49bd3fb2 Merge branch '3.0' 2023-03-06 06:47:18 -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
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
b9996fda00 Tests/EC: add unit test for naked PKCS8 public key 2023-03-04 22:14:46 -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
db622e4b18 Revert "Tests: void return types weren't introduced until PHP 7.1"
This reverts commit 13833af749.
2023-03-03 14:40:37 -06:00
terrafrost
e2fc09311e Merge branch '3.0' 2023-03-03 14:40:24 -06:00
terrafrost
13833af749 Tests: void return types weren't introduced until PHP 7.1 2023-03-03 14:39:25 -06:00
terrafrost
922cfd8dea Merge branch '3.0' 2023-03-02 04:52:55 -06:00
Simon Podlipsky
b946c6eed9 style: run csfixer 2023-03-02 04:52:25 -06:00
Robert
d012d6cd03 Adding getter for timeout to SSH2 2023-02-28 12:52:01 -06:00
terrafrost
1b1e729632 backport enhancements from the 2.0 branch 2023-02-11 22:20:03 -06:00
terrafrost
5d51328dd5 Merge branch '3.0' 2023-02-11 20:57:49 -06:00
terrafrost
d3e72bd1fc Merge branch '2.0-github-actions' into 3.0 2023-02-11 20:40:52 -06:00
terrafrost
e42185c672 BigInteger: fix for hex numbers with new lines in them 2023-02-11 19:08:08 -06:00
terrafrost
de80c6a955 Tests: hex numbers with new lines in them should have own test 2023-02-11 18:28:57 -06:00
terrafrost
233f617e08 Tests: don't test encrypted OpenSSH private keys on 32-bit installs 2023-02-11 17:56:02 -06:00
terrafrost
ca2c9588ea Merge branch '3.0' 2023-02-05 23:47:08 -06:00
terrafrost
508eaa7197 Tests: PHPUnit 10 updates 2023-02-05 17:33:16 -06:00
Jack Worman
985b3c4f7c Throw \phpseclib3\Exception\ExceptionInterface exceptions 2022-09-26 07:41:32 -05:00
terrafrost
19fe966933 CS adjustment 2022-09-23 22:46:02 -05:00
terrafrost
c1f284d6b8 Merge branch '3.0' 2022-09-23 22:43:52 -05:00
terrafrost
df21050d03 Tests/X509: add test for PSS signed CRL signed by PKCS1 X509 2022-09-23 18:48:55 -05:00
terrafrost
8c53a80405 Merge branch '3.0' 2022-09-23 16:15:43 -05:00
terrafrost
9158033ddb CS adjustment 2022-09-23 15:23:25 -05:00
terrafrost
ea5a4c3c62 Tests/X509: add unit test for CRL creation with PSS keys 2022-09-23 15:02:44 -05:00
terrafrost
2f3555a9b4 Merge branch '3.0' 2022-08-27 06:16:19 -05:00
terrafrost
c5a9ee5234 fix deprecated implicit float to int on 32-bit PHP 8.1 2022-08-27 05:53:55 -05:00
terrafrost
b1aef24a86 EC: eliminate dynamic property from Ed25519/448 handling 2022-08-21 21:38:30 -05:00
terrafrost
a4dba26ec5 CS adjustments 2022-08-21 13:30:27 -05:00
terrafrost
71fa541c9a Merge branch 'jworman' 2022-08-20 23:19:34 -05:00
terrafrost
b64952680e Merge branch '3.0' 2022-08-20 17:38:19 -05:00
terrafrost
0b3c6e27fc add JSON Web Key (JWK) support 2022-08-20 17:38:12 -05:00
terrafrost
3c73d61e7e Merge branch '3.0' 2022-08-19 09:22:57 -05:00
terrafrost
e5396968c5 use libsodium's base64 decoding if available 2022-08-19 09:11:46 -05:00
Jack Worman
6958ba1627 php-cs-fixer @PHP81Migration rule set 2022-08-18 08:10:12 -05:00
Jack Worman
80f2d7f521 php-cs-fixer - php 7.4 rules 2022-08-18 08:10:08 -05:00
terrafrost
32e85c2145 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2022-08-13 16:52:58 -05:00
terrafrost
1d04f9b1d4 Merge branch 'callmejon' 2022-08-13 09:05:30 -05:00
terrafrost
259f44207a
Merge pull request #1824 from jack-worman/Php_7.3
Php 7.3 php-cs-fixer rule and composer.json scripts
2022-07-31 23:43:07 -05:00
terrafrost
2e549e3aa1 Merge branch '3.0' 2022-07-31 17:28:30 -05:00
terrafrost
826d8d6670 make it so OpenSSH encrypted keys can be created 2022-07-31 17:14:20 -05:00
terrafrost
3691aefd2b CS adjustments 2022-07-31 08:48:04 -05:00
terrafrost
69d3f8548a Merge branch 'bcrypt3' 2022-07-30 19:49:05 -05:00
terrafrost
1e10a6ab7a fix bad merge 2022-07-30 18:51:45 -05:00
terrafrost
450a961785 Merge branch 'bcrypt2' into bcrypt3 2022-07-30 18:07:26 -05:00
terrafrost
11977eeb3c Merge branch 'bcrypt' into bcrypt2 2022-07-28 16:55:43 -05:00
terrafrost
34a277ff16 a few small tweaks 2022-07-28 16:44:29 -05:00
Jonny Fonsato
5411695c0b
changed as mentioned by Terrafrost 2022-07-28 16:38:51 +02:00
terrafrost
0c8994bbad Crypt/RSA: add support for loading OpenSSH encrypted keys 2022-07-28 08:11:42 -05:00
Jack Worman
510a93a50a Php 7.3
- Update php requirement to >=7.3
- Add php-cs-fixer rule: @PHP73Migration
2022-07-22 21:45:53 -05:00
terrafrost
a95abeb4c4 Merge remote-tracking branch 'jworman/Php_7.1' 2022-07-22 18:29:53 -05:00
terrafrost
a9c3f10de4 Merge branch '3.0' 2022-07-15 09:18:37 -05:00
terrafrost
feced404bb EC/PKCS8: OpenSSL didn't like phpseclib formed Ed25519 public keys 2022-07-15 09:18:15 -05:00
Jack Worman
7154fd98d2 Php 7.1 2022-07-08 21:42:28 -05:00
Jack Worman
e210166f43 Php 7.1 Upgrade 2022-07-08 08:37:58 -05:00
Jack Worman
81ffdbc4ef Merge branch 'master' into Upgrade_to_Php_7.0
# Conflicts:
#	phpseclib/Crypt/EC/BaseCurves/Prime.php
#	phpseclib/Crypt/EC/Formats/Keys/XML.php
#	phpseclib/Crypt/RSA/PrivateKey.php
#	phpseclib/File/ANSI.php
#	phpseclib/File/ASN1.php
#	phpseclib/File/X509.php
#	phpseclib/Net/SFTP.php
#	phpseclib/Net/SFTP/Stream.php
#	phpseclib/Net/SSH2.php
#	phpseclib/System/SSH/Agent.php
#	phpseclib/System/SSH/Agent/Identity.php
#	tests/Unit/Math/BigInteger/TestCase.php
2022-07-03 07:48:16 -05:00
terrafrost
1fd995abdf Merge branch '3.0-type-hinting-backport' into 3.0 2022-07-02 21:49:55 -05:00
terrafrost
250f1a5b51 more backporting 2022-07-02 21:49:45 -05:00
Jack Worman
97902d4bd3 Upgrade to PHP 7.0 2022-07-02 16:26:15 -05:00
terrafrost
9e77203746 Tests/BigInteger: make unit test do == vs === 2022-06-26 17:16:17 -05:00
terrafrost
5f137d60ec Tests/ASN1Test: update tests to work with decodeBER returning null 2022-06-22 07:57:03 -05:00
terrafrost
2e963c0002 Tests/BigInteger: fix 8.2 deprecation errors 2022-05-10 23:08:46 -05:00
Jack Worman
0a69972571 Clean Up Tests 2022-03-15 18:49:38 -05:00
Jack Worman
46758107de GitHub actions 2022-03-08 06:08:01 -06:00
Jack Worman
574953061a PSR4 for tests and added fall-through for switches
PSR4 for tests and added fall-through for switches
2022-02-27 01:26:31 -06:00
Jack Worman
ea9f6540f3 PSR12 fixes
PSR12 fixes
2022-02-19 17:06:13 -06:00
terrafrost
9f6af761b0 Merge branch '2.0' into 3.0 2022-02-17 08:19:47 -06:00
terrafrost
019b4ffd3a Merge branch '1.0' into 2.0 2022-02-17 00:35:01 -06:00
terrafrost
45d2ddcbc4 RSA: add support for loading PuTTY v3 keys 2022-02-17 00:32:21 -06:00
terrafrost
5bc572e2ce EC/PKCS8: OpenSSL didn't like phpseclib formed Ed25519 private keys
Tested with openssl pkey -in private.pem -pubout -text on
OpenSSL 1.1.1f 31 Mar 2020
2022-02-14 21:15:36 -06:00
terrafrost
f5858a6a1d Tests/RSA: add test for changing PKCS8 encryption parameters 2022-02-14 19:25:13 -06:00
terrafrost
f96f3505a8 Hash: add support for keccak256 2022-02-08 20:34:17 -06:00
Filippo Tessarotto
e884929175
EC: decipher private key to generate signature 2022-02-04 10:15:39 +01:00
Jack Worman
ef66d9f7dd php-cs-fixer ci
php-cs-fixer ci
2022-02-01 20:29:48 -06:00
Jack Worman
5916c2bff8 Fixed risky tests 2022-01-31 09:53:36 -06:00
terrafrost
1017120fa9 Merge branch '2.0' into 3.0 2022-01-28 15:10:07 -06:00
terrafrost
c8d379daa5 Crypt/Base: add OFB8 as a new mode 2022-01-28 14:39:16 -06:00
terrafrost
8c137a19e4 Tests/Salsa20: use stream[0..63] instead of xor-digest 2021-12-04 22:44:20 -06:00
terrafrost
4141799c02 Tests: fix issues with Salsa20 / ChaCha20 unit tests 2021-12-04 18:43:12 -06:00
terrafrost
35d8974ac1 Tests: ChaCha20 and Salsa20 unit tests weren't being ran 2021-12-04 16:27:52 -06:00
thephilosoft
aa88c5621b fix: fix syntax errors in ChaCha20 and Salsa20 tests 2021-12-04 15:42:25 -06:00