terrafrost
c17a2604a0
Merge branch 'master-reorg'
2016-09-17 09:15:11 -07:00
terrafrost
5416b9eddc
Merge branch '2.0'
2016-08-28 10:45:37 -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
676c1982c7
fix bad merge
2016-08-04 01:04:00 -05:00
klemens
dd23d91d41
spelling fixes
2016-08-04 00:47:52 -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
d64599f799
Move _encodeLength and _decodeLength to Common\Functions\ASN1.php
2016-07-31 09:37:13 -05:00
terrafrost
c509909004
Organizational Revamp
...
- rename \phpseclib\Crypt\Base to \phpseclib\Crypt\Common\SymmetricKey
- create BlockCipher and StreamCipher to extend SymmetricKey
- replace _string_shift with \phpseclib\Common\Functions\Strings::shift
2016-07-30 22:18:06 -05:00
terrafrost
a9bee37187
Merge branch '2.0'
2016-07-23 18:39:41 -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
d31c89a8ae
Merge branch '2.0'
2016-07-20 00:18:17 -05:00
terrafrost
6c0575f8db
ASN1: update code to use 2.0-style constants
2016-07-20 00:17:24 -05:00
terrafrost
7eb0712a01
Merge branch '2.0'
2016-07-19 23:52:15 -05:00
terrafrost
485b8e0463
Merge branch '1.0' into 2.0
2016-07-19 23:52:09 -05:00
terrafrost
d525aa66f2
ASN1: adjust ordering of SET OF values
2016-07-19 23:48:23 -05:00
terrafrost
a490e06b48
Merge branch '2.0'
2016-06-26 20:43:33 -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
John Sterling
a1e16797ca
Improve performance of File\ASN1->_decode_ber() for large data
...
This removes the use of _string_shift() which copies the (potentially large)
latter part of the input data repeatedly, in favor of maintaining a position var
and using string indexing or substr() to only copy the (relatively small)
current data as it is parsed.
2016-06-26 19:39:44 -05:00
terrafrost
5b464a169a
Merge branch '2.0'
2016-06-19 10:54:43 -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
f815e43077
Merge branch '2.0'
2016-06-12 14:19:56 -05:00
terrafrost
a2e77a7728
Merge branch 'x509-constructed-dns-2.0' into 2.0
2016-06-12 14:19:39 -05:00
Dennis Birkholz
18200131df
Change default signature algorithm from SHA1 to SHA256
2016-06-05 18:09:00 +02:00
Paragon Initiative Enterprises
0e8fa93676
Use paragonie/constant_time_encoding
2016-05-12 16:28:40 -04: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
398a795e1f
Revert "undo merging of master to 2.0 branch"
...
This reverts commit 8fb4c3363d
2016-04-30 16:23:35 -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
b86497d298
Merge branch '2.0'
2015-12-14 11:02:14 -06:00
terrafrost
8448f63d76
Merge branch '1.0' into 2.0
2015-12-14 11:01:51 -06:00
terrafrost
041ece8b6c
Merge branch 'identifier-update-1.0' into 2.0
...
Conflicts:
phpseclib/Net/SSH2.php
2015-12-05 10:30:08 -06:00
terrafrost
37535744b2
small tweaks
2015-11-21 22:55:20 -05: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
