Commit Graph

4620 Commits

Author SHA1 Message Date
terrafrost
b3593f1ce5 Merge branch '2.0' into 3.0 2022-08-28 11:07:47 -05:00
terrafrost
8dbb8667f1 fix bad merge 2022-08-28 11:03:15 -05:00
terrafrost
88fbf6ab97 Merge branch '1.0' into 2.0 2022-08-28 10:34:26 -05:00
terrafrost
1168ba4d27 backport 3.0's PHP 8.1 32-bit fixes 2022-08-28 09:54:08 -05:00
terrafrost
2026b0c0db Hash: fix PHP 8.2 error
see https://github.com/php/php-src/issues/8924
2022-08-27 08:33:17 -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
1762ad4d9e CS adjustments 2022-08-23 21:37:53 -05:00
terrafrost
0b9b0074c9 backport more dynamic property fixes 2022-08-23 20:01:11 -05:00
terrafrost
b1aef24a86 EC: eliminate dynamic property from Ed25519/448 handling 2022-08-21 21:38:30 -05:00
terrafrost
0b3c6e27fc add JSON Web Key (JWK) support 2022-08-20 17:38:12 -05:00
terrafrost
13b241e3e9 use libsodium's hex (en|de)coding if available 2022-08-19 22:49:26 -05:00
terrafrost
e5396968c5 use libsodium's base64 decoding if available 2022-08-19 09:11:46 -05:00
terrafrost
ea94a73380 Merge branch '2.0' into 3.0 2022-08-17 00:08:15 -05:00
terrafrost
cf6ff7dad0 Merge branch '1.0' into 2.0 2022-08-17 00:08:08 -05:00
terrafrost
3d05201d40 X509: include the query part of the URL 2022-08-17 00:07:54 -05:00
terrafrost
e78edac015 Merge branch '3.0-logging-enhancements' into 3.0 2022-08-16 19:19:40 -05:00
terrafrost
9f03f6ea01
Merge pull request #1828 from walkonthemarz/3.0
Revert back the commit https://github.com/phpseclib/phpseclib/commit/
2022-08-13 22:43:52 -05:00
walkonthemarz
871f37087d Revert back the commit 85205bf6d5 2022-08-12 16:42:11 +08:00
terrafrost
7fbd6d5fef Merge branch '2.0' into 3.0 2022-07-31 19:34:49 -05:00
terrafrost
3a087da5cc Merge branch '1.0' into 2.0 2022-07-31 19:34:42 -05:00
terrafrost
a44b56d4b5 Crypt/Base: fix PHP 8.2 deprecation error 2022-07-31 19:29:31 -05:00
terrafrost
826d8d6670 make it so OpenSSH encrypted keys can be created 2022-07-31 17:14:20 -05:00
terrafrost
e54624c085 CS adjustments 2022-07-31 09:31:41 -05:00
terrafrost
4b0af1fa92 Merge branch 'bcrypt2' into bcrypt3 2022-07-31 09:14:22 -05:00
terrafrost
af7a69a66f Merge branch 'bcrypt' into bcrypt2 2022-07-31 09:04:54 -05:00
terrafrost
2d6713cd54 Crypt: CRYPT_BASE_USE_SAFE_INTVAL -> CRYPT_BASE_USE_REG_INTVAL 2022-07-31 08:59:21 -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
abb6a62384 fix bad merge 2022-07-28 17:35:12 -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
terrafrost
cd716bcf36 updates to make phpseclib 1.0 work on older PHP versions 2022-07-28 08:42:14 -05:00
terrafrost
0c8994bbad Crypt/RSA: add support for loading OpenSSH encrypted keys 2022-07-28 08:11:42 -05:00
terrafrost
76a7b07bda Crypt/Blowfish: partial refactor for bcrypt 2022-07-24 17:37:31 -05:00
terrafrost
445077e733 Crypt/Base: rewrite how safe_intval check is done 2022-07-24 16:51:56 -05:00
terrafrost
33b8a299b5 SymmetricKey: CS update 2022-07-23 09:39:33 -05:00
terrafrost
cd5a38ef3b Merge branch '2.0' into 3.0 2022-07-23 09:32:44 -05:00
terrafrost
d22110b057 Crypt/Base: rm php <= 5.3.0 code 2022-07-23 09:31:42 -05:00
terrafrost
a7a39624b0 Merge branch '1.0' into 2.0 2022-07-23 09:28:21 -05:00
terrafrost
ccbb116db3 Crypt/Base: limit conditions under which safe_intval is used 2022-07-23 09:22:00 -05:00
terrafrost
2d11f6e820 Merge branch '2.0' into 3.0 2022-07-16 23:49:46 -05:00
terrafrost
e30765fdc8 Merge branch '1.0' into 2.0 2022-07-16 23:49:40 -05:00
terrafrost
22e66a4e3c BACKERS: add Tharyrok - thank you!! 2022-07-16 23:49:15 -05:00
terrafrost
114f8c8f77 backport more changes from master 2022-07-16 09:03:17 -05:00
Anthony Ryan
dd9146e259 Fix return type comment on Crypt/RSA::createKey()
Function returns a Crypt/RSA/PrivateKey and updating
the PHPDoc for it will help with static analysis.
2022-07-15 15:30:47 -05:00
terrafrost
c73b9f0884 RSA/XML: rm redundant check 2022-07-15 12:28:56 -05:00
terrafrost
89944c813c Composer: phpseclib 3 uses DOM vs XML 2022-07-15 09:55:12 -05:00
terrafrost
243ec71f6f Merge branch '2.0' into 3.0 2022-07-15 09:54:58 -05:00
terrafrost
dd92c40037 Merge branch '1.0' into 2.0 2022-07-15 09:54:12 -05:00
terrafrost
ad8fd7c135 Composer: add additional suggests 2022-07-15 09:40:50 -05:00