Commit Graph

3309 Commits

Author SHA1 Message Date
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
terrafrost
92623daba8 BigInteger: fix issues with bitwise_xor 2018-01-22 00:38:42 -06:00
terrafrost
8879fa0018 Tests/BigInteger: add bitwise_xor test 2018-01-22 00:18:55 -06:00
terrafrost
739d826a16 Tests/X509: update for master branch 2018-01-21 13:01:24 -06:00
terrafrost
fe71957c37 Merge branch '2.0' 2018-01-21 13:01:06 -06:00
terrafrost
bb3798c731 Tests/X509: update tests for 2.0 branch 2018-01-21 12:39:38 -06:00
terrafrost
c419f1121f Merge branch '1.0' into 2.0 2018-01-21 12:38:35 -06:00
terrafrost
8aecafc92f X509: fix 7.2 error when extensions were removed and new ones added 2018-01-21 12:36:49 -06:00
terrafrost
c8829e7865 Tests/X509: add unit test for #1243 2018-01-21 12:14:08 -06:00
Andrey Bolonin
838e8f69c5
add php nightly tests 2018-01-17 14:04:35 +02:00
terrafrost
59faa1d253 Merge branch '2.0' 2018-01-01 13:09:18 -06:00
terrafrost
d0155508e9 Merge branch '1.0' into 2.0 2018-01-01 13:09:05 -06:00
terrafrost
49957b966d Merge branch '2.0-channel-request-updates' into 2.0 2018-01-01 13:09:03 -06:00
terrafrost
30a11a3951 SFTP: update state cache accordingly when file becomes directory 2018-01-01 13:07:45 -06:00
terrafrost
3c96ca9fd1 Merge branch '2.0-channel-request-updates' into master-channel-request-updates 2017-12-25 19:12:57 -06:00
terrafrost
2a09816088 Merge branch '1.0-channel-request-updates' into 2.0-channel-request-updates 2017-12-25 19:11:13 -06:00