Commit Graph

4846 Commits

Author SHA1 Message Date
terrafrost
e2a20a6ad9 fix bad merge 2022-08-27 07:33:21 -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
584e84d7b8 Merge branch '3.0' 2022-08-23 21:38:06 -05:00
terrafrost
1762ad4d9e CS adjustments 2022-08-23 21:37:53 -05:00
terrafrost
62f7c8aa10 CS tweaks 2022-08-23 21:26:31 -05:00
terrafrost
feb5fad15d Merge branch '3.0' 2022-08-23 20:59:06 -05:00
terrafrost
0b9b0074c9 backport more dynamic property fixes 2022-08-23 20:01:11 -05:00
terrafrost
1e5fae186e Merge branch '3.0' 2022-08-21 21:47:25 -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
a01c3915ce Merge branch '3.0' 2022-08-20 06:19:24 -05:00
terrafrost
13b241e3e9 use libsodium's hex (en|de)coding if available 2022-08-19 22:49:26 -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
16ade5d634 Quality tool fixes 2022-08-18 08:25:29 -05:00
Jack Worman
a8f30f516a Throw exception instead of triggering error, and added base exception interface 2022-08-18 08:10:12 -05:00
Jack Worman
3f3de53503 Use loop for encrypting $p 2022-08-18 08:10:12 -05:00
Jack Worman
6958ba1627 php-cs-fixer @PHP81Migration rule set 2022-08-18 08:10:12 -05:00
Jack Worman
c74ad399e6 Update composer.json homepage 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
Jack Worman
f199a0cfe9 Update authors - jack worman 2022-08-18 08:08:31 -05:00
terrafrost
0e4e513900 Merge branch '3.0' 2022-08-17 00:08:21 -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
9e7efc914d fix bad merge 2022-08-16 19:38:23 -05:00
terrafrost
fd6e53719c Merge branch '3.0' 2022-08-16 19:32:51 -05:00
terrafrost
e78edac015 Merge branch '3.0-logging-enhancements' into 3.0 2022-08-16 19:19:40 -05:00
terrafrost
54055bba44 Merge branch '3.0' 2022-08-13 22:45:47 -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
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
f928536632 EC: make secret field in savePrivateKey optional 2022-08-12 13:12:16 -05:00
walkonthemarz
871f37087d Revert back the commit 85205bf6d5 2022-08-12 16:42:11 +08:00
Jonny Fonsato
5c8966334e
removed initialization where not needed 2022-08-02 11:50:12 +02:00
Jonny Fonsato
05cdd09f52
add --ignore-platform-req=php for fix test error 2022-08-02 11:06:37 +02: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
652e84934d
Merge pull request #1823 from jack-worman/Re-add_old_x
Re-add_old_x
2022-07-31 23:27:51 -05:00
terrafrost
92984a318f Merge branch '3.0' 2022-07-31 19:35:05 -05: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
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
e95febd5aa rm safe_intval 2022-07-31 16:03:41 -05:00
terrafrost
65f405916b Merge branch 'bcrypt3' into bcrypt4 2022-07-31 10:46:08 -05:00