Commit Graph

3607 Commits

Author SHA1 Message Date
terrafrost
0dd1048553 Merge branch '2.0' into 3.0 2019-12-08 21:44:49 -06:00
terrafrost
63e4c9a4a9 Merge branch '1.0' into 2.0 2019-12-08 21:44:05 -06:00
Graham Campbell
3f9780f7c5
Updated Travis Config 2019-12-08 13:09:57 +00:00
Graham Campbell
1dc39be3dd
Update .travis.yml 2019-12-08 13:05:14 +00:00
Graham Campbell
99024c4e7d
Update .travis.yml 2019-12-08 12:47:31 +00:00
Graham Campbell
3a26b8fc46
Updated Travis Config 2019-12-08 12:40:26 +00:00
terrafrost
7e72d923ce Merge branch '3.0' 2019-12-07 18:57:28 -06:00
terrafrost
d35f987cb4
Merge pull request #1437 from terrafrost/phpseclib3
rename phpseclib/phpseclib to phpseclib/phpseclib3 for 3.0 branch
2019-12-07 18:55:49 -06:00
terrafrost
f1d04b23db Merge branch '3.0' into phpseclib3 2019-11-23 01:55:36 -06:00
terrafrost
d587dd5e1f Merge branch '3.0' 2019-11-23 01:53:45 -06:00
terrafrost
ea27295c8f SSH2: ssh-ed25519 keys didn't work 2019-11-23 00:58:12 -06:00
terrafrost
653dbd7f94 rename phpseclib/phpseclib to phpseclib/phpseclib3 for 3.0 branch 2019-11-21 19:38:03 -06:00
terrafrost
c43a99daf1 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2019-11-17 06:24:17 -06:00
terrafrost
9737b617fb Merge branch '3.0' 2019-11-13 23:48:29 -06:00
terrafrost
4f7992a9ca Merge branch '2.0' into 3.0 2019-11-13 23:48:20 -06:00
terrafrost
e3557220d7 SSH2: sodium_compat doesn't support memzero 2019-11-13 23:47:16 -06:00
terrafrost
33a8224636 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2019-11-02 21:51:51 -05:00
terrafrost
c65733b5bb Merge branch '3.0' 2019-11-02 12:44:44 -05:00
terrafrost
8ad4743364 Merge branch '2.0' into 3.0 2019-11-02 12:44:34 -05:00
terrafrost
53dcc19441 Merge branch '1.0' into 2.0 2019-11-02 12:43:08 -05:00
terrafrost
a4ed6b80f3 SSH2: make window resizing behave more consistently with PuTTY 2019-11-02 12:42:34 -05:00
terrafrost
cb8cc30337
add github as a sponsorship source 2019-10-20 21:23:37 -05:00
terrafrost
0054e7b43b Merge branch '3.0' 2019-10-20 14:01:28 -05:00
terrafrost
2a0c1b6e59 Merge branch '2.0' into 3.0 2019-10-20 14:01:13 -05:00
terrafrost
0e9b752f56 Merge branch '1.0' into 2.0 2019-10-20 14:00:41 -05:00
terrafrost
74c69cc43c Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0 2019-10-20 14:00:13 -05:00
terrafrost
66650f0659 Merge branch '3.0' 2019-10-20 13:45:38 -05:00
terrafrost
e7e563d0ce Merge branch '2.0' into 3.0 2019-10-20 13:45:06 -05:00
terrafrost
941230c2df RSA: adustments for 2.0 branch 2019-10-20 13:38:45 -05:00
terrafrost
e36f9388cb Merge branch '1.0' into 2.0 2019-10-20 13:27:24 -05:00
Brice Figureau
207cd0f4ea (#1423) make PSS verification work for non power of 2 keys
RFC3447 doesn't require RSA public keys to be power of 2 keys.
The actual validation code doesn't work when trying to verify
a PSS signature generated with a non power of two key.
This small patch adds support for such keys.
2019-10-20 13:27:01 -05:00
terrafrost
34c78baf4c Merge branch '3.0' 2019-10-10 00:00:39 -05:00
terrafrost
f36b4686c9 SSH2: fix E_NOTICE for diffie-hellman key exchange 2019-10-09 23:59:32 -05:00
terrafrost
01340054a5 Merge branch '3.0' 2019-10-05 19:57:04 -05:00
terrafrost
7cbeb7df48 Merge branch '2.0' into 3.0 2019-10-05 19:56:57 -05:00
terrafrost
cf8a7ef715 Merge branch '1.0' into 2.0 2019-10-05 19:56:28 -05:00
terrafrost
cafe42ae95
Merge pull request #1417 from bantu/remove-broken-coverage
Remove obsolete code coverage upload solution.
2019-10-05 19:53:22 -05:00
Andreas Fischer
e37b7a7e48 Remove obsolete code coverage upload solution. 2019-10-05 09:43:08 +02:00
terrafrost
5ff9e7b48b Merge branch '3.0' 2019-09-28 13:05:50 -05:00
terrafrost
bd534c9271 Merge branch '2.0' into 3.0 2019-09-28 13:05:42 -05:00
terrafrost
d8b8275282 Merge branch '1.0' into 2.0 2019-09-28 13:03:14 -05:00
terrafrost
a34a4edac5 SSH2: arcfour128 / arcfour256 was being included twice 2019-09-28 12:57:33 -05:00
terrafrost
62770de289 Merge branch '3.0' 2019-09-28 08:34:30 -05:00
terrafrost
ce4722ade0 Merge branch '2.0' into 3.0 2019-09-28 08:34:18 -05:00
terrafrost
55d74d7f99 Merge branch '1.0' into 2.0 2019-09-28 08:34:02 -05:00
terrafrost
ee2ac9f818 SSH2: rm code that is never called 2019-09-28 08:32:32 -05:00
terrafrost
070ed06d1e Merge branch '3.0' 2019-09-24 22:21:26 -05:00
terrafrost
72fe2540ab readd visibility for 3.0 branch 2019-09-24 22:21:07 -05:00
terrafrost
52203748de Merge branch '2.0' into 3.0 2019-09-24 22:20:39 -05:00
terrafrost
c00a199484 Merge branch '1.0' into 2.0 2019-09-24 22:20:26 -05:00