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 |
|
terrafrost
|
96dd14fd6f
|
Merge branch 'extractber-fix' into extractber-fix-2.0
Conflicts:
phpseclib/File/X509.php
|
2015-10-22 09:56:07 -05:00 |
|
terrafrost
|
46bb95a265
|
X509: improve base64-encoded detection rules
|
2015-10-22 09:45:40 -05:00 |
|
terrafrost
|
49ee6d7fd2
|
Tests/X509: PHP5 adjustments
|
2015-06-07 10:30:55 -05:00 |
|
terrafrost
|
22b10c6a3a
|
Merge branch 'asn1-fix-1.0' into asn1-fix-2.0
|
2015-06-07 10:24:11 -05:00 |
|
terrafrost
|
1ecd006685
|
Tests/X509/CSR: add unit test for ASN1 changes
|
2015-06-04 23:08:55 -05: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 |
|