WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

scp: correct the ScpStreamRead() comment 

The helper drains a WS_EXTDATA and retries the read rather than handing
it back, so it is no longer error-code transparent for that one status.
Say so where the claim is made, and condense the rest.
pull/1258/head
John Safranek 2026-09-14 11:33:34 -07:00 committed by Paul Adelsbach
parent 10d97e151f
commit 74491247cb
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wolfscp.c
View File

@ -171,13 +171,11 @@ static int ScpStreamSend(WOLFSSH* ssh, byte* data, word32 sz)
/* Reads up to sz bytes into data, completing any rekey that fires mid-read.
*
* Flushes queued output before reading so a KEXINIT enqueued by a receive-side
* highwater rekey is actually sent, otherwise the peer can wait for our KEXINIT
* while we block on the read. On a read that fails with WS_REKEYING the worker
* is driven to finish the rekey and the read is retried. The helper is
* error-code transparent: every other status (WS_EOF, WS_EXTDATA,
* WS_CHANNEL_CLOSED, WS_SOCKET_ERROR_E, WS_WANT_READ/WS_WANT_WRITE, byte count)
* is returned unchanged so each caller keeps its existing branch handling.
* Flushes queued output first, or a KEXINIT from a receive-side highwater
* rekey sits unsent while both ends block on a read. A WS_REKEYING is driven
* to completion and a WS_EXTDATA is drained, then the read retries; every
* other status passes through unchanged, so callers keep their branch
* handling.
*/
static int ScpStreamRead(WOLFSSH* ssh, byte* data, word32 sz)
{