Commit Graph

2466 Commits

Author SHA1 Message Date
terrafrost
1c4fe6b5ba Merge branch 'unsupported-hash-update' 2016-06-19 19:47:04 -05:00
terrafrost
15f0c3e5e6 Merge branch '2.0' 2016-06-19 19:45:08 -05:00
terrafrost
eeb65b2341 Merge branch '1.0' into 2.0 2016-06-19 19:45:00 -05:00
Mathieu Pipet
6c8affcf11 fixed sending stream resulting in a zero byte file 2016-06-19 19:44:06 -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
52014b25d2 Merge branch '2.0' 2016-06-18 23:33:58 -05:00
terrafrost
7bdb09c4bd Merge branch '1.0' into 2.0 2016-06-18 23:29:33 -05:00
terrafrost
6ff421d354 BigInteger/RSA: don't compare openssl versions > 1.0 2016-06-18 23:28:33 -05:00
terrafrost
ffe912d621 rm PHP 5.3 / 5.4 from .travis.yml
I guess one of phpseclib's require-dev dependencies broke BC by
upping the version requirements..
2016-06-18 20:50:38 -05:00
terrafrost
e7bf628613 composer.lock update 2016-06-18 20:33:46 -05:00
terrafrost
f815e43077 Merge branch '2.0' 2016-06-12 14:19:56 -05:00
terrafrost
97c8d9eff3 Merge branch '1.0' into 2.0 2016-06-12 14:19:42 -05:00
terrafrost
a2e77a7728 Merge branch 'x509-constructed-dns-2.0' into 2.0 2016-06-12 14:19:39 -05:00
terrafrost
002a927746 Merge branch 'x509-constructed-dns' into 1.0 2016-06-12 14:19:08 -05:00
terrafrost
7a628c62b0 don't do phpinfo() check 2016-06-11 20:29:02 -05:00
terrafrost
68a09b8af0 SSH2: i incorrectly thought i had saved when i did git commit -a 2016-06-11 19:38:23 -05:00
terrafrost
2bae0c3881 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2016-06-11 19:17:15 -05:00
terrafrost
414b980b83 Merge branch '2.0' 2016-06-11 19:16:25 -05:00
terrafrost
8bb4592225 Merge branch 'stream-get-contents-1.0' into 2.0 2016-06-06 23:05:15 -05:00
terrafrost
a06ca1d212 Merge pull request #997 from DennisBirkholz/pull-change-defaults
Change default signature algorithm from SHA1 to SHA256
2016-06-05 11:35:48 -05:00
terrafrost
e64a55955f Crypt/Base: trie -> true 2016-06-05 11:28:28 -05:00
Dennis Birkholz
18200131df Change default signature algorithm from SHA1 to SHA256 2016-06-05 18:09:00 +02:00
terrafrost
fc2a7cef20 RSA: adjustments for master branch 2016-06-04 23:46:40 -05:00
terrafrost
80e9d663cf Tests/RSA: update unit test for master branch changes 2016-06-04 23:24:49 -05:00
terrafrost
5714875b71 Merge branch '2.0' 2016-06-04 23:22:24 -05:00
terrafrost
706dcfb8d6 RSA: update unit test for 2.0 branch 2016-06-04 23:22:02 -05:00
terrafrost
39913e1248 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2016-06-04 22:58:32 -05:00
terrafrost
6b66c1cd52 Merge branch '2.0' 2016-06-04 22:56:55 -05:00
terrafrost
87040bc518 Merge branch '1.0' into 2.0 2016-06-04 22:56:49 -05:00
terrafrost
09b73aedbb Merge branch 'rsa-approach-2' into 1.0 2016-06-04 22:56:36 -05:00
terrafrost
41d3d04a08 Merge pull request #996 from terrafrost/constanttime-adjustments
remove a few calls to paragonie/constant_time_encoding
2016-06-04 22:50:17 -05:00
terrafrost
e2a0b701c7 remove a few calls to paragonie/constant_time_encoding
- Hex::decode('aabb') can be replaced with "\xaa\xbb"
- Hex::decode(sha1('...')) can be replaced with sha1('...', true)
2016-06-04 22:31:23 -05:00
terrafrost
2db6b8421a Merge branch '2.0' 2016-06-04 14:56:54 -05:00
terrafrost
934523289a CHANGELOG: update for 2.0.2 release 2016-06-04 14:56:30 -05:00
terrafrost
2550301678 SSH2: use stream_get_* instead of fread() / fgets() 2016-05-23 00:46:41 -05:00
terrafrost
48fef11389 Merge branch 'cte' 2016-05-21 17:34:05 -05:00
Paragon Initiative Enterprises
adcbecae78 Use paragonie/constant_time_encoding 2016-05-21 12:57:53 -05:00
terrafrost
4cac42745e Merge remote-tracking branch 'scott/v3.0-cte' 2016-05-21 12:00:32 -05:00
terrafrost
ed6ccb4bd7 Merge branch '2.0' 2016-05-12 20:15:44 -05:00
terrafrost
3d265f7c07 Merge branch '1.0' into 2.0 2016-05-12 20:15:21 -05:00
terrafrost
e3de9b7bb1 CHANGELOG: add entry for 1.0.2 2016-05-12 20:13:11 -05:00
Paragon Initiative Enterprises
0e8fa93676 Use paragonie/constant_time_encoding 2016-05-12 16:28:40 -04:00
terrafrost
942d194d0a RSA: don't attempt to use the CRT when zero value components exist 2016-05-09 13:46:28 -05:00
terrafrost
a2130ff111 Merge branch '2.0' 2016-05-08 01:36:04 -05:00
terrafrost
c784d9e1e5 reapply PR #931 2016-05-08 01:34:37 -05:00
terrafrost
a3fdde757d Merge branch '2.0' 2016-05-07 19:01:46 -05:00
terrafrost
511a7b77ba Merge branch '1.0' into 2.0 2016-05-07 19:01:31 -05:00
terrafrost
b8f3a76632 README: update download link 2016-05-07 19:01:00 -05:00