Commit Graph

5455 Commits

Author SHA1 Message Date
terrafrost
f71cc096db
Merge pull request #1962 from LordSimal/3.0
fix syntax error
2023-11-23 05:34:54 -06:00
Kevin Pfeifer
ad968b2f69 fix syntax error 2023-11-23 10:05:17 +01:00
terrafrost
11bde49f67 Merge branch '3.0' 2023-11-22 18:09:07 -06:00
terrafrost
8ecd156ce1 SSH2: reset more internal variables when connection is reset 2023-11-22 18:08:38 -06:00
terrafrost
c6f25ccde3 Merge branch '3.0' 2023-11-22 12:45:05 -06:00
terrafrost
be05f4ef1f Merge branch '2.0' into 3.0 2023-11-22 12:44:52 -06:00
terrafrost
f1e58543b0 Merge branch '1.0' into 2.0 2023-11-22 12:39:23 -06:00
terrafrost
e84886fde2 SSH2: another attempt at #1960 2023-11-22 12:38:34 -06:00
terrafrost
d88db1afea Merge branch '3.0' 2023-11-22 08:21:55 -06:00
terrafrost
7b893c5cb4 Merge branch '2.0' into 3.0 2023-11-22 08:18:49 -06:00
terrafrost
70c7ffe42c Merge branch '1.0' into 2.0 2023-11-22 08:14:20 -06:00
terrafrost
49c9439878 SSH2: use phpseclib's preferred order for auth algorithms 2023-11-22 08:13:46 -06:00
terrafrost
77b00c3169 CS adjustment 2023-11-22 05:12:24 -06:00
terrafrost
cf1be6a3d3 Merge branch '3.0' 2023-11-22 04:51:42 -06:00
terrafrost
7cc1814f9d Merge branch '2.0' into 3.0 2023-11-22 04:44:23 -06:00
terrafrost
848992230f Merge branch '1.0' into 2.0 2023-11-21 23:03:12 -06:00
terrafrost
356ab5f76a SSH2: add support for RFC8308 2023-11-21 23:02:42 -06:00
terrafrost
cf18ffca5c Merge branch '3.0' 2023-11-21 19:44:30 -06:00
terrafrost
eafbc8a1a0 CS adjustment 2023-11-21 19:44:19 -06:00
terrafrost
7294cf963e CS adjustment 2023-11-21 19:21:14 -06:00
terrafrost
f6801388a8 Merge branch '3.0' 2023-11-21 19:11:59 -06:00
terrafrost
964d78101a Math/BinaryField: fix for excessively large degrees 2023-11-21 19:10:46 -06:00
terrafrost
7ca852e5e7 CS adjustment 2023-11-19 09:57:28 -06:00
terrafrost
7336c9c49f Merge branch '3.0' 2023-11-19 09:56:08 -06:00
terrafrost
9bfd136259 PKCS8: PBES2 / DES encrypted keys didn't work 2023-11-19 09:51:15 -06:00
terrafrost
820ec76610 add unit test for PKCS8 RSA keys with DES encryption 2023-11-19 09:41:38 -06:00
terrafrost
c9f4345812 CS adjustment 2023-11-12 09:10:15 -06:00
terrafrost
194b5af961 Merge branch '3.0' 2023-11-12 09:09:13 -06:00
terrafrost
c21db263b0 PKCS8: RC2 encrypted keys didn't work 2023-11-12 09:02:35 -06:00
terrafrost
80e82babe9 add unit test for PKCS8 RSA keys with RC2 / MD5 encryption 2023-11-12 08:50:59 -06:00
terrafrost
6f4559f2f3 Merge branch '3.0' 2023-11-04 16:15:50 -05:00
terrafrost
3ecde6bf6a SSH2: don't use AES GCM for TurboFTP Server 2023-11-04 16:13:09 -05:00
terrafrost
ec6338ecd2 another CS adjustment after merger 2023-11-01 20:51:12 -05:00
terrafrost
afeffdea3c Merge branch '3.0' 2023-11-01 20:50:22 -05:00
terrafrost
b19dd5ec7b CS adjustments 2023-11-01 20:44:31 -05:00
terrafrost
5b27f8f26e CS adjustments 2023-11-01 20:30:35 -05:00
terrafrost
8714be625b Merge branch '3.0' 2023-11-01 20:23:50 -05:00
terrafrost
ecd2512a32 Tests: don't do echo in unit tests 2023-11-01 20:23:28 -05:00
terrafrost
70a6271d21 Merge branch '3.0' 2023-11-01 19:48:46 -05:00
terrafrost
90e3b38a29 Merge branch 'ieee' into 3.0 2023-11-01 19:48:32 -05:00
terrafrost
cd4c30e6d0 add test for prime field with prime numbers 2023-11-01 19:43:29 -05:00
terrafrost
0086be8af1 EC/Signature/Format: add new IEEE format 2023-11-01 19:19:07 -05:00
terrafrost
93417928cc Merge branch '3.0' 2023-10-31 09:51:13 -05:00
terrafrost
ce753669bc PrimeField: fix error with squareRoot method 2023-10-31 08:47:58 -05:00
terrafrost
b0e223e89b Merge branch '3.0' 2023-10-21 09:00:57 -05:00
terrafrost
33fa69b251 CHANGELOG: add 3.0.33 release 2023-10-21 09:00:39 -05:00
terrafrost
fb3f51b9f7 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2023-10-21 07:49:01 -05:00
terrafrost
55fd1afc87 Merge branch '3.0' 2023-10-21 07:22:18 -05:00
terrafrost
46602823cc CS adjustment 2023-10-21 07:21:42 -05:00
terrafrost
9a79a4ffe0 Merge branch '3.0' 2023-10-20 23:23:02 -05:00