1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-12 09:09:39 +01:00
Commit Graph

4844 Commits

Author SHA1 Message Date
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
terrafrost
7795ad0969 Merge branch '3.0' 2022-07-16 23:49:51 -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
5e524c3f21 Merge branch '3.0' 2022-07-16 09:16:37 -05:00
terrafrost
114f8c8f77 backport more changes from master 2022-07-16 09:03:17 -05:00
terrafrost
57031bdf9a Merge branch '3.0' 2022-07-15 15:32:05 -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
35be18b292 Merge branch '3.0' 2022-07-15 12:29:19 -05:00
terrafrost
c73b9f0884 RSA/XML: rm redundant check 2022-07-15 12:28:56 -05:00
terrafrost
167fa7d382 Merge branch '3.0' 2022-07-15 09:56:00 -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
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
terrafrost
7aa6c08a85 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2022-07-14 23:16:14 -05:00
terrafrost
4914e91a33 Merge branch '3.0' 2022-07-14 23:05:51 -05:00
terrafrost
1692298efd Merge branch '2.0' into 3.0 2022-07-14 23:05:42 -05:00
terrafrost
1359431224 Merge branch '1.0' into 2.0 2022-07-14 23:04:58 -05:00