danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-13 17:47:29 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'sftpv455-2.0' into sftpv456-3.0

Browse Source
This commit is contained in:
terrafrost 2021-09-16 16:24:11 -05:00
commit 0dbbeb39ce
2 changed files with 517 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
phpseclib/Common/Functions/Strings.php
View File

@ -70,6 +70,7 @@ abstract class Strings
* C = byte * C = byte
* b = boolean (true/false) * b = boolean (true/false)
* N = uint32 * N = uint32
* Q = uint64
* s = string * s = string
* i = mpint * i = mpint
* L = name-list * L = name-list
@ -100,6 +101,12 @@ abstract class Strings
throw new \LengthException('At least four byte needs to be present for successful N / i / s / L decodes'); throw new \LengthException('At least four byte needs to be present for successful N / i / s / L decodes');
} }
break; break;
case 'Q':
if (strlen($data) < 8) {
throw new \LengthException('At least eight byte needs to be present for successful N / i / s / L decodes');
}
break;
default: default:
throw new \InvalidArgumentException('$format contains an invalid character'); throw new \InvalidArgumentException('$format contains an invalid character');
} }
@ -114,6 +121,19 @@ abstract class Strings
list(, $temp) = unpack('N', self::shift($data, 4)); list(, $temp) = unpack('N', self::shift($data, 4));
$result[] = $temp; $result[] = $temp;
continue 2; continue 2;
case 'Q':
// pack() added support for Q in PHP 5.6.3 and PHP 5.6 is phpseclib 3's minimum version
// so in theory we could support this BUT, "64-bit format codes are not available for
// 32-bit versions" and phpseclib works on 32-bit installs. on 32-bit installs
// 64-bit floats can be used to get larger numbers then 32-bit signed ints would allow
// for. sure, you're not gonna get the full precision of 64-bit numbers but just because
// you need > 32-bit precision doesn't mean you need the full 64-bit precision
list(, $upper, $lower) = unpack('NN', self::shift($data, 8));
$temp = $upper ? 4294967296 * $lower : 0;
$temp+= $lower < 0 ? ($temp & 0x7FFFFFFFF) + 0x80000000 : $temp;
// $temp = hexdec(bin2hex(self::shift($data, 8)));
$result[] = $temp;
continue;
} }
list(, $length) = unpack('N', self::shift($data, 4)); list(, $length) = unpack('N', self::shift($data, 4));
if (strlen($data) < $length) { if (strlen($data) < $length) {
@ -165,6 +185,13 @@ abstract class Strings
} }
$result.= $element ? "\1" : "\0"; $result.= $element ? "\1" : "\0";
break; break;
case 'Q':
if (!is_int($element) || !is_float($element)) {
throw new \InvalidArgumentException('An integer was expected.');
}
// 4294967296 == 1 << 32
$result.= pack('NN', $element / 4294967296, $element);
break;
case 'N': case 'N':
if (is_float($element)) { if (is_float($element)) {
$element = (int) $element; $element = (int) $element;

604
phpseclib/Net/SFTP.php
View File

File diff suppressed because it is too large Load Diff