1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-15 10:26:59 +01:00
Commit Graph

70 Commits

Author SHA1 Message Date
Jack Worman
81ffdbc4ef Merge branch 'master' into Upgrade_to_Php_7.0
# Conflicts:
#	phpseclib/Crypt/EC/BaseCurves/Prime.php
#	phpseclib/Crypt/EC/Formats/Keys/XML.php
#	phpseclib/Crypt/RSA/PrivateKey.php
#	phpseclib/File/ANSI.php
#	phpseclib/File/ASN1.php
#	phpseclib/File/X509.php
#	phpseclib/Net/SFTP.php
#	phpseclib/Net/SFTP/Stream.php
#	phpseclib/Net/SSH2.php
#	phpseclib/System/SSH/Agent.php
#	phpseclib/System/SSH/Agent/Identity.php
#	tests/Unit/Math/BigInteger/TestCase.php
2022-07-03 07:48:16 -05:00
Jack Worman
97902d4bd3 Upgrade to PHP 7.0 2022-07-02 16:26:15 -05:00
terrafrost
5f137d60ec Tests/ASN1Test: update tests to work with decodeBER returning null 2022-06-22 07:57:03 -05:00
Jack Worman
574953061a PSR4 for tests and added fall-through for switches
PSR4 for tests and added fall-through for switches
2022-02-27 01:26:31 -06:00
Jack Worman
ea9f6540f3 PSR12 fixes
PSR12 fixes
2022-02-19 17:06:13 -06:00
Jack Worman
ef66d9f7dd php-cs-fixer ci
php-cs-fixer ci
2022-02-01 20:29:48 -06:00
Jack Worman
5916c2bff8 Fixed risky tests 2022-01-31 09:53:36 -06:00
terrafrost
ae15ac69d0 Merge branch 'moosa-2.0' into moosa-3.0 2021-04-03 17:12:38 -05:00
terrafrost
43eeb853f1 Merge branch 'moosa-1.0' into moosa-2.0 2021-04-03 16:47:37 -05:00
terrafrost
10cee4514c Tests/ASN1: test for bad tag 2021-04-03 13:53:20 -05:00
terrafrost
c1d21edb94 Tests/ASN1: add tests for constructed mismatches 2021-04-03 13:44:29 -05:00
terrafrost
104a57badd Merge branch 'moosa-2.0' into moosa-3.0 2021-04-03 13:28:23 -05:00
terrafrost
730070b78f Tests/ASN1: update unit tests to work on 2.0 branch 2021-04-03 13:25:56 -05:00
terrafrost
bac775ecd5 Merge branch 'moosa-1.0' into moosa-2.0 2021-04-03 13:19:15 -05:00
terrafrost
6be326e7e7 Tests/ASN1: add test for OID garbage bytes 2021-04-03 12:04:07 -05:00
terrafrost
2eec2e0ab2 Merge branch 'moosa-1.0' into moosa-2.0 2021-04-03 11:57:40 -05:00
terrafrost
dbd210c4a7 Tests/ASN1: add test for null garbage bytes 2021-04-03 11:38:11 -05:00
terrafrost
c25dff2ef0 Merge branch '2.0-class-rename' into 3.0-class-rename 2020-12-12 22:26:03 -06:00
terrafrost
0676524dfd Merge branch '1.0-class-rename' into 2.0-class-rename 2020-12-12 21:41:10 -06:00
terrafrost
e6abc61f45 rm adding of dupe classes (they break annotations) 2020-12-12 21:39:58 -06:00
terrafrost
e4bf7b111a Merge branch '2.0' into 3.0 2020-12-12 19:22:36 -06:00
terrafrost
5701295017 Merge branch '1.0' into 2.0 2020-12-12 17:13:41 -06:00
terrafrost
266f16816a enable unit tests for PHP 8 / PHPUnit 9 2020-12-12 15:11:04 -06:00
terrafrost
653dbd7f94 rename phpseclib/phpseclib to phpseclib/phpseclib3 for 3.0 branch 2019-11-21 19:38:03 -06:00
terrafrost
666cde2b11 Merge branch '2.0' into 3.0 2019-09-18 08:46:54 -05:00
terrafrost
4027717852 Merge branch '1.0' into 2.0 2019-09-18 08:42:47 -05:00
Remi Collet
17610d105c fix tests for 5.3 2019-09-18 08:03:35 -05:00
terrafrost
2286c834bd Merge branch '2.0' 2019-08-02 23:41:40 -05:00
terrafrost
d51b07597a Merge branch '1.0' into 2.0 2019-08-02 22:55:22 -05:00
terrafrost
511f55de3d X509: fix issue with explicit time tags whose maps expect implicit 2019-08-02 22:00:33 -05:00
terrafrost
b09bc1883e Merge branch 'oid-revamp-2.0' 2019-05-02 07:28:27 -05:00
terrafrost
98cbccc81a Merge branch 'oid-revamp' into oid-revamp-2.0 2019-05-02 07:18:37 -05:00
terrafrost
e793461543 ASN1: revamp how OIDs are handled 2019-05-01 09:17:53 -05:00
terrafrost
4bc53f1251 Merge branch '2.0' 2018-09-17 00:29:24 -05:00
terrafrost
32ce6a0d3e Tests/ASN1: update unit test to work on 2.0 2018-09-17 00:27:42 -05:00
terrafrost
48aa55b7f6 Merge branch '1.0' into 2.0 2018-09-17 00:27:25 -05:00
Michiel Brandenburg
b4e66d343e Fixes #1296 parsing invalid certificate 2018-09-17 00:25:55 -05:00
terrafrost
28b26b50df Merge branch '2.0' 2018-04-15 10:31:12 -05:00
terrafrost
bbc651f0b6 Merge branch '1.0' into 2.0 2018-04-15 10:27:46 -05:00
terrafrost
7fc3cf69f8 Tests/ASN1: add test for commit 6dc7b3e 2018-04-15 08:30:02 -05:00
Sokolovskyy Roman
966ee7f170 Long array() to short [] syntax 2017-11-27 09:30:14 +01:00
terrafrost
7182ec393b make classes with only static methods abstract 2016-11-30 09:25:04 -06:00
terrafrost
874ada8d93 ASN1: make methods static 2016-11-27 22:38:11 -06:00
terrafrost
6dc50cc5c9 ASN1: update unit test for 2.0 branch 2016-08-28 10:45:31 -05:00
terrafrost
281cfcdcea Merge branch '1.0' into 2.0 2016-08-28 10:45:04 -05:00
terrafrost
5c2ffd2544 ASN1: fix infinite loop during ASN1 decode process 2016-08-28 10:43:33 -05:00
terrafrost
b4cf10fc94 Revert "Merge branch '2.0'"
This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing
changes made to 638fe6971c.
2016-04-10 11:30:59 -05:00
terrafrost
4b69dcb1ca Revert "Merge remote-tracking branch 'bantu/bootstrap'"
This reverts commit ef04c870e9, reversing
changes made to cd57bf31ae.
2016-04-10 11:25:31 -05:00
Andreas Fischer
9f0f8fd7e5 Correct indentation on pvno array definition. 2015-12-05 10:33:28 -06:00
Andreas Fischer
694579617e Merge branch '1.0' into 2.0
* 1.0:
  Correct indentation on pvno array definition.
2015-12-01 10:06:19 +01:00