terrafrost
1587c5498b
Merge branch '1.0-travis-exp' into 2.0-travis-exp
2017-12-03 20:22:57 -06:00
terrafrost
703f7840db
X509: use anonymous function in PHP >= 5.3.0
2017-12-03 15:55:58 -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
836d452acd
Merge branch '1.0' into 2.0
2017-09-30 22:56:32 +01:00
terrafrost
6f47ef808e
X509: fix issues when using datetime without a timezone set in ini
2017-09-30 22:54:33 +01:00
terrafrost
df1a650485
Merge branch '1.0' into 2.0
2017-08-28 23:31:51 -05:00
terrafrost
4b1102de7e
X509: updates to DateTime integration
2017-08-28 23:29:03 -05:00
terrafrost
221a9be8e6
Merge branch 'datetime-1.0' into datetime-2.0
2017-08-24 12:50:00 -05:00
terrafrost
09c17b1a31
ASN1 / X509: update to use DateTime instead of unix time
2017-08-24 12:48:15 -05:00
terrafrost
4b24877a2c
Merge branch '1.0' into 2.0
2017-05-14 08:50:13 -05:00
terrafrost
19c71e4a98
X509: include subjectaltname extension even if only one domain name
2017-05-14 08:49:04 -05:00
terrafrost
52dcabb279
Merge pull request #1104 from metaclassing/fix-array-map-namespace
...
namespacing the array_map function
2017-03-07 21:50:41 -06:00
Metaclassing
42a7ff61ff
namespacing the array_map function
2017-03-07 15:22:44 -06:00
terrafrost
f74ba2c581
Merge branch '1.0' into 2.0
2016-12-24 19:49:30 -06:00
terrafrost
da6e5211df
X509: ignore certificate transparency extension
2016-12-17 17:41:56 -06:00
terrafrost
845135f887
add PHP5-style constructors along side PHP4-style ones
2016-09-10 10:41:05 -07:00
terrafrost
676c1982c7
fix bad merge
2016-08-04 01:04:00 -05:00
terrafrost
c547ee16c7
Merge branch '1.0' into 2.0
2016-08-04 00:31:15 -05:00
klemens
dca95ac662
spelling fixes
2016-08-04 00:19:27 -05:00
terrafrost
17a14eceb2
Merge branch '1.0' into 2.0
2016-06-26 20:34:15 -05:00
John Sterling
88ce26f8ca
Improve performance of File\X509->_mapInExtensions() for large arrays
...
This avoids passing array references by-value to is_array()
(which would trigger a copy) by refactoring _subArray() into
a separate is_array() check on a by-value var, and a separate
unchecked reference return.
2016-06-26 19:44:48 -05:00
terrafrost
0121b45011
Merge branch '1.0' into 2.0
2016-06-19 10:53:45 -05:00
terrafrost
b6801c837c
X509: set parameter fields to null for CSR's / RSA
2016-06-19 10:53:20 -05:00
terrafrost
a2e77a7728
Merge branch 'x509-constructed-dns-2.0' into 2.0
2016-06-12 14:19:39 -05:00
terrafrost
c784d9e1e5
reapply PR #931
2016-05-08 01:34:37 -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 ef04c870e9cd57bf31ae
2016-04-10 11:25:31 -05:00
terrafrost
b69fa7f2a9
Merge branch '2.0'
2016-02-07 11:54:16 -06:00
metaclassing
4735751bf5
Switched out pack/unpack and ip2long/long2ip with inet_pton/ntop for ipv6 encoding support in x509v3 subject alternative names
2016-01-26 17:23:14 -06:00
Joey3000
bdc28b9453
Cherry-picking cleanup of use operator usage
...
Picked c9a80ff748
2016-01-21 19:41:41 +01:00
Joey3000
c9a80ff748
Cleanup of use operator usage
...
This does the following:
1. Removes superfluous usage of the `use` operator. Specifically, that operator is not needed to use classes in the same `namespace` as the object (see https://secure.php.net/manual/en/language.namespaces.rules.php ).
2. While at it, also sorted the `use` operators alphabetically, for a better overview.
2016-01-18 05:05:31 +01:00
terrafrost
806249c7e9
RSA: changes to how encryption / signatures work
2015-12-25 11:28:24 -06:00
terrafrost
efe36d67ce
Merge branch 'master' into rsa-plugins
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-10-22 10:16:52 -05: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
2048a49aac
use self:: in phpdoc comments to reduce merge conflicts
2015-10-11 12:22:07 -05:00
terrafrost
91887c957d
Merge remote-tracking branch 'upstream/master' into rsa-plugins
...
Conflicts:
phpseclib/Crypt/RSA.php
phpseclib/Net/SSH2.php
2015-10-01 15:57:31 -05:00
terrafrost
ec3fe7277b
RSA: move key format handling to plugins
2015-10-01 15:41:11 -05:00
Andreas Fischer
70f55bd156
Merge pull request #825 from terrafrost/rsa-revamp
...
RSA: make createKey static and make it return RSA objects
* terrafrost/rsa-revamp:
RSA: make createKey static and make it return RSA objects
2015-09-25 13:16:56 +02:00
terrafrost
fab5a66fe5
RSA: make createKey static and make it return RSA objects
2015-09-24 09:43:19 -05:00
Andreas Fischer
ccd18552e5
Merge branch '2.0'
...
* 2.0:
Fixed phpdoc
Conflicts:
phpseclib/Crypt/Hash.php
2015-09-16 13:36:04 +02:00
Graham Campbell
7f1bbfe216
Fixed phpdoc
2015-09-14 16:30:31 +01:00
Andreas Fischer
3342eb6d09
Merge branch '2.0'
...
* 2.0:
Fixed another case
Minor tweaks
Fixed error
More fixes
PHPDoc fixes
2015-09-14 01:27:11 +02: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
