danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-15 02:17:04 +01:00
Code Issues Projects Releases Wiki Activity
4,686 Commits 6 Branches 31 Tags 19 MiB
81ffdbc4ef
Commit Graph

4686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
terrafrost
da6c1b06bf SSH2: add support for zlib and zlib@openssh.com compression 2021-10-26 20:04:53 -05:00
terrafrost
17fb1331ed Merge branch '3.0' 2021-10-13 22:00:40 -05:00
terrafrost
01cdf396b2 Merge branch '2.0' into 3.0 2021-10-13 22:00:32 -05:00
terrafrost
3da069570c Merge branch '1.0' into 2.0 2021-10-13 22:00:20 -05:00
terrafrost
30a9a1541c Tests/SSH2: fix intermittently failing unit test 2021-10-13 21:03:54 -05:00
terrafrost
3945c15b43 Merge branch '3.0' 2021-10-13 19:58:37 -05:00
Christopher Davis
24150b26f6 Don't Use Array Unpackage for Status Code -> Error 
the `status_codes` property is an array with integer keys and string
values, but the `$error` value in `SFTP::logError` was trying to be unpacked
from an array.

Seems to come from cee3f3cd4a, but even at
that commit the `status_codes` data structure was still an array.

This bug is only present in 3.X, 2.X release didn't unpack here:
a684f12065/phpseclib/Net/SFTP.php (L829)
 2021-10-13 19:58:27 -05:00
terrafrost
b7b8d755fa Merge branch '3.0' 2021-10-12 20:37:42 -05:00
terrafrost
2ec8356121 Merge branch '2.0' into 3.0 2021-10-12 20:37:34 -05:00
terrafrost
a684f12065 Merge branch '1.0' into 2.0 2021-10-12 20:37:27 -05:00
terrafrost
6f8d12ffc7 Tests: tests were being skipped because their deps had no asserts 2021-10-12 20:35:38 -05:00
terrafrost
efa5b8a066 Merge branch '3.0' 2021-10-11 09:18:27 -05:00
terrafrost
a2c30f9d33 Merge branch '2.0' into 3.0 2021-10-11 09:15:37 -05:00
terrafrost
eacb9f8614 Merge branch '1.0' into 2.0 2021-10-11 09:02:22 -05:00
terrafrost
74f1c9ed7b SSH2: CS adjustments 2021-10-11 08:58:43 -05:00
terrafrost
9a61525f44 SSH2: rm unnecessary code 2021-10-11 08:53:21 -05:00
terrafrost
0fe328936c SSH2: implement a different fix for #1613 2021-10-11 08:47:51 -05:00
terrafrost
5cfa2137ab Merge branch '3.0' 2021-10-09 13:35:16 -05:00
terrafrost
2564032e6f Merge branch '2.0' into 3.0 2021-10-09 13:32:07 -05:00
terrafrost
2f3ca7123d SSH2: fix channel constant 2021-10-09 13:31:14 -05:00
terrafrost
4c9b067b63 Merge branch '3.0' 2021-10-09 13:27:46 -05:00
terrafrost
b3e39538b8 Merge branch '2.0' into 3.0 2021-10-09 13:27:40 -05:00
terrafrost
7b2097c6bd Merge branch '1.0' into 2.0 2021-10-09 13:24:22 -05:00
terrafrost
1fab947f01 SSH2: fixes for noisy channels 2021-10-09 13:21:09 -05:00
terrafrost
8545a78223 Merge branch '2.0' 2021-10-09 13:01:45 -05:00
terrafrost
644af71b6c SSH2: readd public for 3.0 branch 2021-10-09 13:00:30 -05:00
terrafrost
025b8beb8f Merge branch '2.0' into 3.0 2021-10-09 13:00:03 -05:00
terrafrost
fe6e2b9bfe Merge branch '1.0' into 2.0 2021-10-09 12:59:56 -05:00
terrafrost
b29f134c24 SSH2: CS adjustments 2021-10-09 12:59:48 -05:00
terrafrost
4ee4ef76f6 Merge branch '3.0' 2021-10-09 08:32:22 -05:00
terrafrost
844a8d2c3a Merge branch '2.0' into 3.0 2021-10-09 08:28:37 -05:00
terrafrost
f25f8c0db8 Merge branch '1.0' into 2.0 2021-10-09 08:26:29 -05:00
terrafrost
8d4831ad1f SFTP: CS adjustments 2021-10-09 08:26:11 -05:00
terrafrost
d9a73a410b Merge branch '3.0' 2021-10-09 07:51:23 -05:00
terrafrost
cd80f98788 Merge branch '2.0' into 3.0 2021-10-09 07:51:17 -05:00
terrafrost
7c14eedbfd Merge branch '1.0' into 2.0 2021-10-09 07:50:36 -05:00
terrafrost
e4d2416bdc SSH2: SSH-2.0-CoreFTP is 15 bytes long - not 13 2021-10-09 07:50:10 -05:00
terrafrost
0a73af1337 Merge branch '3.0' 2021-09-28 20:56:57 -05:00
terrafrost
b192ec0d12 Merge branch '2.0' into 3.0 2021-09-28 20:56:36 -05:00
terrafrost
b07abf7848 Merge branch '1.0' into 2.0 2021-09-28 20:55:48 -05:00
terrafrost
d8ea63dbdb
Merge pull request #1697 from terrafrost/sftpv456-3.0 
add SFTP v4/5/6 support to phpseclib v3
 2021-09-28 20:39:40 -05:00
terrafrost
1c8718f3dd
Merge pull request #1696 from terrafrost/sftpv456-2.0 
add SFTP v4/5/6 support to phpseclib v2
 2021-09-28 20:39:29 -05:00
terrafrost
a09eb04296
Merge pull request #1695 from terrafrost/sftpv456 
add SFTP v4/5/6 support to phpseclib v1
 2021-09-28 20:39:18 -05:00
terrafrost
0e6f4247f2 Merge branch '1.0' 2021-09-28 09:00:11 -05:00
terrafrost
13b5ad9593 Merge branch '1.0' into 3.0 2021-09-28 09:00:00 -05:00
terrafrost
addfd93b71 Merge branch '1.0' into 2.0 2021-09-28 08:59:13 -05:00
terrafrost
3ef68bd912 RSA: ssh-keygen -yf private.key fails if \r is present 2021-09-28 08:57:41 -05:00
terrafrost
defd5d23b1 fix bad merge 2021-09-18 10:35:21 -05:00
terrafrost
0dbbeb39ce Merge branch 'sftpv455-2.0' into sftpv456-3.0 2021-09-16 16:24:11 -05:00
terrafrost
0af7ef7d9c Merge branch 'sftpv454' into sftpv456-2.0 2021-09-15 20:24:05 -05:00