Commit Graph

4961 Commits

Author SHA1 Message Date
terrafrost
96e49a5e51 Merge branch '3.0' 2023-03-05 07:06:44 -06:00
terrafrost
aff0e68f54 Merge branch '2.0' into 3.0 2023-03-05 07:04:39 -06:00
terrafrost
8339322eb9 Tests/SSH2: CS adjustment 2023-03-05 06:55:50 -06:00
terrafrost
7ce104b12c Merge branch '1.0' into 2.0 2023-03-05 04:18:37 -06:00
terrafrost
34d00869e5 SSH2: backport getTimeout() 2023-03-05 04:07:26 -06:00
terrafrost
79dead6a5e CS adjustments 2023-03-05 00:09:02 -06:00
terrafrost
60358cefb1 Merge branch '3.0' 2023-03-04 23:31:30 -06:00
terrafrost
cf69b29427 Crypt/PKCS8: rm duplicate code and improve detection of public keys 2023-03-04 23:25:36 -06:00
terrafrost
b9996fda00 Tests/EC: add unit test for naked PKCS8 public key 2023-03-04 22:14:46 -06:00
terrafrost
617b096223 Merge branch '3.0' 2023-03-04 21:01:15 -06:00
terrafrost
9a356ba200 Merge branch 'rposky' 2023-03-04 21:00:14 -06:00
terrafrost
71b9b64203 CS adjustments 2023-03-04 20:47:49 -06:00
terrafrost
ea0a2375d2 Merge branch '3.0' 2023-03-03 14:55:02 -06:00
Simon Podlipsky
530f8ab210 feat: add return types to few jsonSerialize() 2023-03-03 14:54:56 -06:00
terrafrost
f8d2ff5ae4 CS adjustments 2023-03-03 14:42:42 -06:00
terrafrost
db622e4b18 Revert "Tests: void return types weren't introduced until PHP 7.1"
This reverts commit 13833af749.
2023-03-03 14:40:37 -06:00
terrafrost
e2fc09311e Merge branch '3.0' 2023-03-03 14:40:24 -06:00
terrafrost
13833af749 Tests: void return types weren't introduced until PHP 7.1 2023-03-03 14:39:25 -06:00
terrafrost
a8e90331c1 Merge branch '3.0' 2023-03-03 14:23:11 -06:00
Simon Podlipsky
c053b895c8 style: add newline at end of BigInteger.php file 2023-03-03 14:23:02 -06:00
terrafrost
c918d60b20 SymmetricKey: rm safe_intval 2023-03-03 14:06:25 -06:00
terrafrost
f519a54e7a Merge branch '3.0' 2023-03-03 12:54:14 -06:00
terrafrost
fbe79b0855 Merge branch '2.0' into 3.0 2023-03-03 09:30:48 -06:00
terrafrost
0af70c5de6 Merge branch '1.0' into 2.0 2023-03-03 09:25:24 -06:00
terrafrost
9e758c180d Blowfish: 32-bit PHP tweaks 2023-03-03 09:24:42 -06:00
terrafrost
922cfd8dea Merge branch '3.0' 2023-03-02 04:52:55 -06:00
Simon Podlipsky
b946c6eed9 style: run csfixer 2023-03-02 04:52:25 -06:00
terrafrost
e77c881b54 Merge branch '3.0' 2023-03-02 03:49:40 -06:00
terrafrost
6298d1cd55 PrimeField: prevent infinite loop with composite primefields 2023-03-02 03:25:08 -06:00
Robert
d012d6cd03 Adding getter for timeout to SSH2 2023-02-28 12:52:01 -06:00
terrafrost
6d7f0def17 Merge branch '3.0' 2023-02-11 22:28:21 -06:00
terrafrost
3b6030d887 Merge branch '2.0' into 3.0 2023-02-11 22:28:10 -06:00
terrafrost
f7ae6b0bfb Merge branch '1.0' into 2.0 2023-02-11 22:21:11 -06:00
terrafrost
1b1e729632 backport enhancements from the 2.0 branch 2023-02-11 22:20:03 -06:00
terrafrost
72f66aa06e fix bad merge 2023-02-11 22:08:27 -06:00
terrafrost
5d51328dd5 Merge branch '3.0' 2023-02-11 20:57:49 -06:00
terrafrost
d3e72bd1fc Merge branch '2.0-github-actions' into 3.0 2023-02-11 20:40:52 -06:00
terrafrost
e42185c672 BigInteger: fix for hex numbers with new lines in them 2023-02-11 19:08:08 -06:00
terrafrost
de80c6a955 Tests: hex numbers with new lines in them should have own test 2023-02-11 18:28:57 -06:00
terrafrost
233f617e08 Tests: don't test encrypted OpenSSH private keys on 32-bit installs 2023-02-11 17:56:02 -06:00
terrafrost
e3b9a97200 Blowfish: fix issues on 32-bit PHP installs 2023-02-11 17:47:40 -06:00
terrafrost
50ab21b7cb Crypt: don't do OpenSSL version check unless OpenSSL is installed 2023-02-11 14:55:25 -06:00
terrafrost
8e8b214820 use github actions instead of travis ci 2023-02-11 14:50:06 -06:00
terrafrost
ad7a7d5c8f fix PHP <5.4 compatability 2023-02-10 12:34:11 -06:00
terrafrost
f4340220ad Composer: use latest version of ParaTest 2023-02-06 02:52:43 -06:00
terrafrost
07605e9ce8 Tests: master branch uses ParaTest vs PHPUnit 2023-02-06 01:55:22 -06:00
terrafrost
ca2c9588ea Merge branch '3.0' 2023-02-05 23:47:08 -06:00
terrafrost
2487192558 AsymmetricKey: error out on unsupported operations 2023-02-05 17:44:51 -06:00
terrafrost
508eaa7197 Tests: PHPUnit 10 updates 2023-02-05 17:33:16 -06:00
terrafrost
c342af1f80 Merge branch '3.0' 2023-01-17 07:56:16 -06:00