From df3dab7d3f3a53fe6fa9f0c0b23effdda8f2f9c3 Mon Sep 17 00:00:00 2001 From: terrafrost Date: Sun, 2 Jul 2023 10:44:51 -0500 Subject: [PATCH 1/3] SFTP: make it so SFTP::RESUME also sets offset of local file --- phpseclib/Net/SFTP.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/phpseclib/Net/SFTP.php b/phpseclib/Net/SFTP.php index 21afad16..2965d36c 100644 --- a/phpseclib/Net/SFTP.php +++ b/phpseclib/Net/SFTP.php @@ -2440,7 +2440,11 @@ class Net_SFTP extends Net_SSH2 if ($local_start >= 0) { fseek($fp, $local_start); $size-= $local_start; + } elseif ($mode & NET_SFTP_RESUME) { + fseek($fp, $offset); + $size-= $offset; } + } elseif ($dataCallback) { $size = 0; } else { From 6aa6a5241f935a00f447702ef9cd834c7cad7f53 Mon Sep 17 00:00:00 2001 From: terrafrost Date: Sun, 2 Jul 2023 10:46:34 -0500 Subject: [PATCH 2/3] SFTP: CS adjustments --- phpseclib/Net/SFTP.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpseclib/Net/SFTP.php b/phpseclib/Net/SFTP.php index 7a4dd7bf..d960b41a 100644 --- a/phpseclib/Net/SFTP.php +++ b/phpseclib/Net/SFTP.php @@ -2385,7 +2385,7 @@ class SFTP extends SSH2 if ($local_start >= 0) { fseek($fp, $local_start); $size-= $local_start; - } elseif ($mode & NET_SFTP_RESUME) { + } elseif ($mode & self::RESUME) { fseek($fp, $offset); $size-= $offset; } From 9197b3ad3ec5f78cc931a43670583df0d0d95db3 Mon Sep 17 00:00:00 2001 From: terrafrost Date: Sun, 2 Jul 2023 11:22:02 -0500 Subject: [PATCH 3/3] ASN1: CS adjustment --- phpseclib/File/ASN1.php | 1 - 1 file changed, 1 deletion(-) diff --git a/phpseclib/File/ASN1.php b/phpseclib/File/ASN1.php index 93fe6c95..cf23dd73 100644 --- a/phpseclib/File/ASN1.php +++ b/phpseclib/File/ASN1.php @@ -21,7 +21,6 @@ namespace phpseclib3\File; -use DateTime; use phpseclib3\Common\Functions\Strings; use phpseclib3\File\ASN1\Element; use phpseclib3\Math\BigInteger;