Commit Graph

3274 Commits

Author SHA1 Message Date
terrafrost
6dc7b3e6b9 ASN1: class is never set as key in _decode_ber 2018-04-14 23:39:05 -05:00
terrafrost
66aa5aec5c Merge branch '2.0' 2018-04-10 19:00:13 -05:00
terrafrost
c2eb8436a9 CHANGELOG: validateLogic -> validateSignature 2018-04-10 18:58:51 -05:00
terrafrost
59047eabd2 Merge branch '1.0' into 2.0 2018-04-10 18:56:54 -05:00
terrafrost
038fbb1203 CHANGELOG: validateLogic -> validateSignature 2018-04-10 18:56:01 -05:00
terrafrost
ab270d1602 Merge branch '2.0' 2018-04-10 00:19:49 -05:00
terrafrost
4548b45b9e Merge branch '1.0' into 2.0 2018-04-09 23:57:25 -05:00
terrafrost
c63c223972 BigInteger: fix for (new BigInteger(48))->toString(true) 2018-04-09 23:47:38 -05:00
terrafrost
48e50fe8fa Tests/BigInteger: add test for conversion of 48 to signed hex 2018-04-09 23:36:36 -05:00
terrafrost
a3081aa7f8 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2018-04-03 20:30:27 -05:00
terrafrost
011f6ad200 BigInteger/PHP: make sure that zero is represented uniformly 2018-04-03 20:23:47 -05:00
terrafrost
d4b0e00d14 Tests/BigInteger: make sure that zero is represented uniformly 2018-04-03 20:19:14 -05:00
terrafrost
e7d96c7aeb Merge branch '2.0' 2018-03-27 11:07:58 -05:00
terrafrost
3dae376e9c Merge remote-tracking branch 'J5lx/2.0-cfb8' into 2.0 2018-03-27 11:06:11 -05:00
terrafrost
8b830700cf Merge branch 'master' of https://github.com/phpseclib/phpseclib 2018-03-27 11:04:25 -05:00
terrafrost
898b14aa05 Merge branch '2.0' 2018-03-27 11:01:45 -05:00
Jakob Gahde
8e6948fdd2
Backport CFB8 support from master 2018-03-27 04:32:16 +02:00
Wes
d4a98457bc Check phpinfo() is available before using
Fixes an issue I raised at https://github.com/phpseclib/phpseclib/issues/1255

Proof of logic at https://3v4l.org/RqrHt

I ended up moving more code than discussed in the issue - initially to avoid `$content` being undefined when it came to `preg_match_all()`, but also as it made sense grouping the code that way. Also, initialising `$versions` outside the check, right at the start ensures it's always defined for the `switch` code further down.
2018-03-24 11:05:16 +00:00
terrafrost
12bd06210c
Merge pull request #1250 from luzpaz/misc-typos
Misc. trivial typos
2018-03-03 15:41:58 -06:00
terrafrost
e9bff8a4de X509: cs updates 2018-03-03 13:57:23 -06:00
terrafrost
1ee4167a03 Merge branch '2.0' 2018-03-03 13:44:36 -06:00
terrafrost
fc90c58f7f X509: update disable/enableURLFetch to work with 2.0 branch 2018-03-03 13:44:11 -06:00
terrafrost
e3a1e47824 Merge branch '1.0' into 2.0 2018-03-03 13:42:46 -06:00
terrafrost
ea47574317 X509: add methods to enable / disable URL fetching 2018-03-03 13:42:17 -06:00
terrafrost
6c4a108a92 Merge branch 'authority-info-access-2.0' into authority-info-access-master 2018-03-03 08:09:26 -06:00
terrafrost
40730d2977 X509: update intermediate cert changes to work on 2.0 branch 2018-03-03 07:46:03 -06:00
luz.paz
380517ef00 Misc. trivial typos
Found via `codespell -q 3`
2018-03-03 07:07:14 -05:00
terrafrost
87decbe94b Merge branch 'authority-info-access-1.0' into authority-info-access-2.0 2018-03-03 00:15:29 -06:00
terrafrost
4438336d44 Tests/X509: add unit test for itermediate cert additions 2018-03-02 13:15:46 -06:00
terrafrost
f5807e1d4e X509: auto download intermediate certs 2018-03-02 12:53:15 -06:00
terrafrost
908dbf341f Merge branch 'master' of https://github.com/phpseclib/phpseclib 2018-02-23 21:41:14 -06:00
terrafrost
2a6f5f825a Asymmetric: fix for phar's
Inspired by 4e367c9631
2018-02-23 21:15:33 -06:00
terrafrost
ef0c0ee0a7
Merge pull request #1242 from andreybolonin/patch-1
add php nightly tests
2018-02-21 15:45:11 -06:00
terrafrost
b9cd84108c AES: fix issue preventing ECB mode from decrypting 2018-02-21 08:26:52 -06:00
terrafrost
2440be341d Tests/AES: add test for ECB mode 2018-02-21 08:20:29 -06:00
terrafrost
596d122a76 X509: code cleanup 2018-02-20 10:12:50 -06:00
terrafrost
1669e24269 Merge branch '2.0' 2018-02-18 22:29:37 -06:00
terrafrost
d305b78082 Merge branch '1.0' into 2.0 2018-02-18 22:29:13 -06:00
terrafrost
894ac25e17 1.0.10 release 2018-02-18 22:25:41 -06:00
terrafrost
55384afdac RSA: make it so you can't sign w/ public key, decrypt w/ private 2018-02-18 16:03:06 -06:00
terrafrost
63b6df29a8 Merge branch '2.0' 2018-02-07 21:24:51 -06:00
terrafrost
473c980d0c Merge branch '1.0' into 2.0 2018-02-07 21:23:21 -06:00
terrafrost
1468ef1a23 SFTP: fix issue with extended attribute on 64-bit PHP installs 2018-02-07 21:22:54 -06:00
terrafrost
7ed7ff2277 README: rm merge conflict code 2018-01-30 00:45:27 -06:00
terrafrost
489627f803 Merge branch '2.0' 2018-01-30 00:40:20 -06:00
terrafrost
2165445f39 Merge branch '1.0' into 2.0 2018-01-30 00:39:52 -06:00
terrafrost
6e9e61c7ca README: rm patron link 2018-01-30 00:39:13 -06:00
terrafrost
44ac8f3996 Merge branch '2.0' 2018-01-22 07:26:57 -06:00
terrafrost
364e05babf Merge branch '1.0' into 2.0 2018-01-22 07:22:29 -06:00
terrafrost
3030f08148 rm PHP 5.4 from Travis 2018-01-22 06:56:26 -06:00