Commit Graph

4915 Commits

Author SHA1 Message Date
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
terrafrost
e54624c085 CS adjustments 2022-07-31 09:31:41 -05:00
terrafrost
08f4ec8f56 Merge branch 'bcrypt3' into bcrypt4 2022-07-31 09:14:36 -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
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
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
Jonny Fonsato
dd86bd9fbd
change secret position after rebase 2022-07-28 16:56:00 +02:00
Jonny Fonsato
5411695c0b
changed as mentioned by Terrafrost 2022-07-28 16:38:51 +02:00
Jonny Fonsato
a3ce8392fd
I have upgraded to php 8.2 with the tests running successfully 2022-07-28 16:30:54 +02: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
b0e034ff9d Merge branch '3.0' 2022-07-23 09:41:56 -05:00
terrafrost
33b8a299b5 SymmetricKey: CS update 2022-07-23 09:39:33 -05:00
terrafrost
0ab44df4ce Merge branch '3.0' 2022-07-23 09:35:02 -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
Jack Worman
bddf9297ca Added some convenient scripts to composer.json 2022-07-22 21:58:10 -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
Jack Worman
5f4c89b688 Re-add_old_x 2022-07-22 21:16:51 -05:00
terrafrost
a699dadb03 tweak comments 2022-07-22 19:16:04 -05:00
terrafrost
a95abeb4c4 Merge remote-tracking branch 'jworman/Php_7.1' 2022-07-22 18:29:53 -05:00