Commit Graph

2443 Commits

Author SHA1 Message Date
terrafrost
b4c7505148 Travis: a dev dep broke bc by upping the php reqs 2016-06-22 12:36:35 -05:00
terrafrost
0c6c223134 Merge branch '1.0' into 2.0 2016-06-22 10:16:58 -05:00
terrafrost
c788ec574f Hash: CS adjustment 2016-06-22 10:10:32 -05:00
terrafrost
0e235a1331 Merge branch '2.0' of https://github.com/terrafrost/phpseclib into 2.0 2016-06-22 09:57:24 -05:00
terrafrost
fadefe5594 Merge branch '1.0' of https://github.com/terrafrost/phpseclib into 1.0 2016-06-22 09:57:11 -05:00
terrafrost
9ce8a39204 Tests/RSA: update unit test to work on 2.0 branch 2016-06-21 22:39:33 -05:00
terrafrost
b08f17f514 Merge branch '1.0' into 2.0 2016-06-21 22:39:05 -05:00
terrafrost
5b8985447c Tests/RSA: update unit test to work with 1.0 branch 2016-06-21 22:38:37 -05:00
andrewbelcher
dd754283bb Fix zero salt length RSA signatures. 2016-06-21 22:33:47 -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
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
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
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
8bb4592225 Merge branch 'stream-get-contents-1.0' into 2.0 2016-06-06 23:05:15 -05:00
terrafrost
706dcfb8d6 RSA: update unit test for 2.0 branch 2016-06-04 23:22:02 -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
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
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
terrafrost
942d194d0a RSA: don't attempt to use the CRT when zero value components exist 2016-05-09 13:46:28 -05:00
terrafrost
c784d9e1e5 reapply PR #931 2016-05-08 01:34:37 -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
terrafrost
a3d3dbd957 Merge branch '1.0' into 2.0 2016-05-07 02:39:17 -05:00
terrafrost
bf31e976c7 RSA: fix PHP4 compatability issue 2016-05-06 22:18:12 -05:00
terrafrost
700338beed Merge branch '1.0' into 2.0 2016-05-06 11:58:07 -05:00
terrafrost
27d9bde6d2 Merge branch 'sftp_readable_writable-1.0' into 1.0 2016-05-06 11:55:50 -05:00
terrafrost
c76b18b869 Merge branch '1.0' into 2.0 2016-05-06 11:50:15 -05:00
artyhedgehog
0dd04d1e9b Fixed confusing SSH2::getErrors return type 2016-05-06 11:49:24 -05:00
terrafrost
e762b0dc29 SFTP: add is_writable, is_writeable and is_readable 2016-05-05 16:41:15 -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
a25ac1cd10 undo merging of master to 2.0 branch 2016-04-28 10:59:53 -05:00
terrafrost
a521bd405f Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0 2016-04-28 10:29:11 -05:00
terrafrost
b4743df277 Revert "Merge branch 'master' of https://github.com/phpseclib/phpseclib"
This reverts commit 638fe6971c, reversing
changes made to c46e8aeec6.
2016-04-28 09:35:49 -05:00
terrafrost
b3171cc63f SFTP: fix logging constants 2016-04-11 19:30:45 -05:00
terrafrost
076c69fa1b Merge branch '1.0' into 2.0 2016-04-11 15:18:50 -05:00
terrafrost
d22bcd63cc SFTP: nlist() on a non-existent directory resulted in error 2016-04-11 15:18:06 -05:00
terrafrost
4bfeeee5a0 Merge branch '2.0' 2016-04-10 11:58:07 -05:00
terrafrost
8556b20220 Travis: rm 5.3.3 support 2016-04-10 11:57:58 -05:00
terrafrost
ceb6dc0255 System/SSH/Agent: fix namespacing on BadConfigurationException 2016-04-10 11:48:08 -05:00