Commit Graph

4534 Commits

Author SHA1 Message Date
terrafrost
380430cb29 Merge branch '3.0' 2021-12-15 07:29:12 -06:00
terrafrost
df918f6af9 Merge branch '2.0' into 3.0 2021-12-15 07:28:38 -06:00
terrafrost
f449152c91 Merge branch '2.0' of https://github.com/phpseclib/phpseclib into 2.0 2021-12-15 07:24:06 -06:00
terrafrost
1272e9fd3c
Merge pull request #1724 from michaelKaefer/master
Remove define() from SSH2 and use class constants instead (master branch)
2021-12-15 05:56:47 -06:00
terrafrost
e0d8b9454a
Merge pull request #1723 from michaelKaefer/3.0
Remove define() from SSH2 and use class constants instead (3.0 branch)
2021-12-15 05:56:29 -06:00
terrafrost
860342f644
Merge pull request #1722 from michaelKaefer/2.0
Remove define() from SSH2 and use class constants instead (2.0 branch)
2021-12-15 05:56:08 -06:00
Michael Käfer
bcec175691 Remove define() from SSH2 and use class constants instead (3.0 branch) 2021-12-14 16:43:57 +01:00
Michael Käfer
d71522d8aa Remove define() from SSH2 and use class constants instead (3.0 branch) 2021-12-14 16:34:41 +01:00
Michael Käfer
624f328c88 Remove define() from SSH2 and use class constants instead 2021-12-14 13:18:33 +01:00
terrafrost
713fa95292 Merge branch '3.0' 2021-12-11 10:26:14 -06:00
terrafrost
13881b09d4 Travis: add PHP 8.1 support
See https://bugs.php.net/75474#1509646645 for more info on the static
change
2021-12-11 10:19:39 -06:00
terrafrost
b1daeb1cb7 Merge branch '1.0' into 2.0 2021-12-10 07:44:50 -06:00
terrafrost
0868023216 Travis: add PHP 8.1.0 2021-12-10 07:39:19 -06:00
terrafrost
013de5ad16 Merge branch '3.0' 2021-12-10 07:32:50 -06:00
terrafrost
8a0e6c05e7 Salsa20: fix PHP 5.6 error
The following demonstrates the error:

function demo(&$x)
{
  $x = 5;
}

$x = $y = [10];
demo(...$y);
echo $x[0];

That outputs 5 in PHP 5.6 and 10 in later PHP versions
2021-12-10 07:30:26 -06:00
terrafrost
e75604733b ... 2021-12-08 19:08:35 -06:00
terrafrost
13e8ebf67d ... 2021-12-08 19:05:51 -06:00
terrafrost
b6375e5a4e Travis: add PHP 8.1 2021-12-08 07:51:06 -06:00
terrafrost
76e4d1e78c Merge branch '3.0' 2021-12-07 22:21:08 -06:00
terrafrost
072a56b2f9 SSH2: allow for stringable objects 2021-12-07 22:20:55 -06:00
terrafrost
7cabdc0748 Merge branch '3.0' 2021-12-07 22:13:23 -06:00
terrafrost
20b9abf589 SSH2: show a more helpful error message when logging in with pubkey 2021-12-07 22:10:29 -06:00
terrafrost
be731e9ae7 Merge branch '3.0' 2021-12-07 21:59:52 -06:00
terrafrost
6a935bb57b Merge branch '2.0' into 3.0 2021-12-07 21:59:47 -06:00
terrafrost
4e1e394aa9 Merge branch '1.0' into 2.0 2021-12-07 21:59:41 -06:00
terrafrost
a74707e080 SSH2: make login() return false if no valid auth methods are found
this is an issue if you, for example, login with a PublicKey instead of a PrivateKey
2021-12-07 21:59:24 -06:00
terrafrost
e9fbf9ed8a Merge branch '1.0' into 2.0 2021-12-07 21:58:21 -06:00
terrafrost
649661cd5e SSH2: make login() return false if no valid auth methods are found 2021-12-07 21:57:55 -06:00
terrafrost
9c44f493ce Merge branch '3.0' 2021-12-04 22:59:34 -06:00
terrafrost
8c137a19e4 Tests/Salsa20: use stream[0..63] instead of xor-digest 2021-12-04 22:44:20 -06:00
terrafrost
4141799c02 Tests: fix issues with Salsa20 / ChaCha20 unit tests 2021-12-04 18:43:12 -06:00
terrafrost
35d8974ac1 Tests: ChaCha20 and Salsa20 unit tests weren't being ran 2021-12-04 16:27:52 -06:00
terrafrost
1b0d423245 Merge branch '2.0' 2021-12-04 16:05:40 -06:00
thephilosoft
aa88c5621b fix: fix syntax errors in ChaCha20 and Salsa20 tests 2021-12-04 15:42:25 -06:00
terrafrost
4671b10d14 Merge branch '3.0' 2021-12-04 15:11:34 -06:00
terrafrost
2bcb643660 Merge branch '2.0' into 3.0 2021-12-04 15:10:52 -06:00
terrafrost
f0a7fc8e63 Merge branch '1.0' into 2.0 2021-12-04 15:09:37 -06:00
terrafrost
e0068833b5 README: fix travis-ci.com link 2021-12-04 15:01:33 -06:00
terrafrost
f3cd784b9b Merge branch '3.0' 2021-11-29 07:25:29 -06:00
terrafrost
dc3e7bda71 Tests/SFTP: PHP 8.1 error message changed 2021-11-29 07:23:49 -06:00
terrafrost
a233605081 Merge branch '3.0' 2021-11-28 17:46:13 -06:00
terrafrost
89bfb45bd8 CHANGELOG: fix bad merge 2021-11-28 17:46:03 -06:00
terrafrost
3542fd5c4d Merge branch '3.0' 2021-11-28 17:31:53 -06:00
terrafrost
bf17f54058 Merge branch '2.0' into 3.0 2021-11-28 17:31:46 -06:00
terrafrost
4e16cf3f5f CHANGELOG: add 2.0.35 release 2021-11-28 17:30:39 -06:00
terrafrost
f39e797bb2 Merge branch '3.0' 2021-11-28 11:35:25 -06:00
terrafrost
1bd5b40ee1 SymmetricKey: add getMode() 2021-11-28 11:27:52 -06:00
terrafrost
2d67d19d2b Merge branch '3.0' 2021-11-22 08:14:46 -06:00
terrafrost
a85c2f0d6e RSA: rm unused privateKey variable 2021-11-22 08:13:55 -06:00
terrafrost
90fdcaedcf Merge branch '3.0' 2021-11-21 21:28:25 -06:00