terrafrost
12090c138e
Tests/X509: update 1.0 test to work on 2.0
2017-11-05 11:42:33 -06:00
terrafrost
d218020747
Merge branch '1.0' into 2.0
2017-11-05 11:42:08 -06:00
terrafrost
ffcff461c4
X509: URL validation didn't work ( #1203 )
2017-11-05 11:36:41 -06:00
terrafrost
f4ae2cf3d3
Merge branch '1.0' into 2.0
2017-04-09 10:23:20 -05:00
Moritz Fain
7fd1eefd66
Fixed ASN.1 UTCTime parsing
2017-04-09 10:15:40 -05:00
terrafrost
91a0866fdc
Tests/X509: add unit test for issue involving multiple domain names
2017-03-07 21:54:41 -06:00
terrafrost
e59e544ed8
Merge branch '1.0' into 2.0
2016-07-23 18:55:35 -05:00
terrafrost
62381365c8
Tests/X509: make dn more generic in unit test
2016-07-23 18:54:25 -05:00
terrafrost
2c4dcd96b4
fix issue with merge
2016-07-23 18:39:25 -05:00
terrafrost
dbdba0b7ef
Merge branch '1.0' into 2.0
2016-07-23 18:16:52 -05:00
terrafrost
dc7f7e4d85
ASN1: fix PHP Warning on PHP 7.1
2016-07-23 11:01:43 -05:00
terrafrost
305dc1967a
Tests/X509: fix bad merge
2016-05-04 00:16:08 -05:00
terrafrost
538b48c346
Merge branch 'x509-constructed-dns' into x509-constructed-dns-2.0
2016-05-03 20:06:48 -05:00
terrafrost
52a7aee1f5
X509: add support for constructed DNs and non-strict DN checks
2016-05-03 18:22:53 -05:00
terrafrost
8fb4c3363d
undo merging of master to 2.0 branch
2016-04-28 15:34:10 -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
terrafrost
b69fa7f2a9
Merge branch '2.0'
2016-02-07 11:54:16 -06:00
metaclassing
88a04862ae
Added unit test for IPv4 and IPv6 address decoding in X509v3 subject alternative names extended attribute
2016-01-27 05:13:47 -06:00
terrafrost
33bf6e42c3
Merge branch '2.0'
2015-10-22 10:14:50 -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
fab5a66fe5
RSA: make createKey static and make it return RSA objects
2015-09-24 09:43:19 -05:00
Andreas Fischer
4387b64426
Merge branch '1.0' into 2.0
...
* 1.0:
Fixed another case
Minor tweaks
Fixed error
More fixes
PHPDoc fixes
Conflicts:
phpseclib/Crypt/Random.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SSH2.php
tests/Functional/Net/SFTPUserStoryTest.php
2015-09-14 01:27:04 +02:00
Graham Campbell
eec8c9cb5d
More fixes
2015-09-06 12:39:14 +01:00
Andreas Fischer
9fbc0358bb
Merge branch '1.0' into 2.0
...
* 1.0:
X509: updates to getOID() as suggested by bantu
X509: add getOID() method
2015-09-02 15:06:35 +02:00
terrafrost
d7d9d782b0
X509: add getOID() method
2015-08-29 22:15:04 -05:00
Andreas Fischer
0f1d043428
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/X509: add unit test showing need for return by reference
2015-08-24 14:02:39 +02:00
terrafrost
a56e0daf07
Tests/X509: add unit test showing need for return by reference
2015-08-13 10:22:01 -05:00
Andreas Fischer
483c253879
Merge branch '1.0' into 2.0
...
* 1.0:
X509: set one more parameter to null
X509: set another parameters field to null
2015-06-30 12:27:06 +02:00
terrafrost
77c757d095
X509: set one more parameter to null
2015-06-29 22:10:18 -05:00
terrafrost
6c2798be90
X509: set another parameters field to null
2015-06-29 21:53:27 -05:00
terrafrost
815f443ed1
Merge branch 'x509-rsa-null-1.0' into x509-rsa-null-2.0-2
...
Conflicts:
tests/Unit/File/X509/X509Test.php
2015-06-28 16:10:40 -05:00
terrafrost
2c8cb0b426
Tests/X509: CS adjustments
2015-06-28 14:52:07 -05:00
terrafrost
2277c0fbac
Tests/X509: typo
2015-06-28 11:40:34 -05:00
terrafrost
46a3c0fbbb
X509: set parameter field to null for RSA keys
2015-06-28 11:32:42 -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
f57e01df65
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/X509: add unit test
X509: make it so you can use File_ASN1_Element for custom X.509 extensions
2015-03-10 13:46:15 +01:00
terrafrost
dad8a9ef37
Tests/X509: add unit test
2015-03-10 01:39:13 -05:00
Andreas Fischer
63ed03b119
Merge branch '1.0' into 2.0
...
* 1.0:
Tests/X509: swap expected and actual value
Tests/X509: fix unit test
Tests/X509: add unit test for unsupported extension encoding
X509: always base64-encode extensions for which _getMapping returns a bool
2015-03-05 15:37:46 +01:00
terrafrost
31e2308ea9
Tests/X509: swap expected and actual value
2015-03-04 23:37:33 -06:00
terrafrost
cc08406a76
Tests/X509: fix unit test
2015-03-04 08:18:54 -06:00
terrafrost
3e1aa8c213
Tests/X509: add unit test for unsupported extension encoding
2015-03-04 08:03:02 -06: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
Clint Nelissen
fe742e18d7
Namespaced Crypt Package
2014-12-16 16:16:54 -08: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