danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-15 02:17:04 +01:00
Code Issues Projects Releases Wiki Activity
4,057 Commits 6 Branches 31 Tags 19 MiB
45d07d336f
Commit Graph

53 Commits

Author SHA1 Message Date
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
Andreas Fischer
2e8e4bf04a Correct indentation on pvno array definition. 2015-11-29 18:44:21 +01:00
terrafrost
d00e20a140 Merge remote-tracking branch 'graham/1.0-phpdoc' into 2.0-phpdoc 
Conflicts:
	phpseclib/Crypt/Base.php
	phpseclib/Net/SCP.php
	tests/Unit/File/ASN1Test.php
 2015-04-16 00:42:53 -05:00
Graham Campbell
e50cbacd4e Fixed some phpdocs 2015-03-29 17:07:17 +01:00
Andreas Fischer
38e6196127 Merge branch 'master' into php5 
* master:
  ASN1: empty constructed context-specific tags error'd out

Conflicts:
	phpseclib/File/ASN1.php
 2015-01-11 16:09:50 +01:00
terrafrost
84325d415e ASN1: empty constructed context-specific tags error'd out 
eg. an attributes field in a CSR that's blank
 2015-01-10 23:58:50 -06:00
Andreas Fischer
3f912eed59 Merge pull request #554 from cnelissen/NamespaceFilePackage 
Namespace file package

* cnelissen/NamespaceFilePackage:
  Namespaced classes
 2014-12-12 17:55:44 +01:00
Clint Nelissen
cea5e317b6 Namespaced classes 2014-12-09 16:53:05 -08:00
Andreas Fischer
c4b103468c Merge pull request #549 from bantu/fix-547 
Change copyright years from roman numeral to decimal numbers.

* bantu/fix-547:
  Change copyright years from roman numeral to decimal numbers.

Conflicts:
	phpseclib/System/SSH_Agent.php
 2014-12-10 00:06:08 +01:00
Andreas Fischer
0efae5a91e Change copyright years from roman numeral to decimal numbers. 2014-12-10 00:04:08 +01:00
Clint Nelissen
a9925941b0 Moved global constants into class constants and updated all references 2014-12-03 18:20:10 -08:00
terrafrost
3785bebcce ASN1: fix unit test 2014-09-24 00:07:49 -05:00
terrafrost
a2f4a2cbba ASN1: add unit test for non-constructed context-specific change 2014-09-22 23:03:06 -05:00
Andreas Fischer
9c3ce656f4 ASN1Test: Even better, use assertCount instead of assertSame. 2014-09-04 22:33:41 +02:00
Andreas Fischer
8e3b83af56 ASN1Test: The expected value comes first in assertEquals/assertSame. 2014-09-04 22:27:33 +02:00
Andreas Fischer
7c2b399915 ASN1Test: Also check the type by using assertSame instead of assertEquals. 2014-09-04 22:26:37 +02:00
terrafrost
bb6d5d9bc0 ASN1: one more unit test change 2014-09-03 20:54:24 -05:00
terrafrost
8293b66136 ASN1: another unit test update 2014-09-03 20:28:07 -05:00