mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-04-18 16:30:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

vlts: use full buffer size when receiving data if possible

Browse Source 
SSL backends like OpenSSL/wolfSSL and other return the content of one
TLS record on read, but usually there are more available.

Change the vtls cfilter recv() function to fill the given buffer until a
read would block.

Closes #10736
This commit is contained in:
Stefan Eissing 2023-03-10 13:00:15 +01:00 committed by Daniel Stenberg
parent 6c6306f300
commit b74bba9aad
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/vtls/vtls.c
View File

@ -1578,13 +1578,45 @@ static ssize_t ssl_cf_recv(struct Curl_cfilter *cf,
CURLcode *err)
{
struct cf_call_data save;
ssize_t nread;
ssize_t nread, n;
CF_DATA_SAVE(save, cf, data);
/* SSL backends like OpenSSL/wolfSSL prefer to give us 1 TLS record content
* at a time when reading. But commonly, more data is available.
* So we try to fill the buffer we are called with until we
* are full or no more data is available. */
*err = CURLE_OK;
nread = Curl_ssl->recv_plain(cf, data, buf, len, err);
CF_DATA_RESTORE(cf, save);
return nread;
nread = 0;
while(len) {
n = Curl_ssl->recv_plain(cf, data, buf, len, err);
if(n < 0) {
if(*err != CURLE_AGAIN) {
/* serious err, fail */
nread = -1;
goto out;
}
/* would block, return this to caller if we have read nothing so far,
* otherwise return amount read without error. */
if(nread == 0)
nread = -1;
else
*err = CURLE_OK;
goto out;
}
else if(n == 0) {
/* eof */
break;
}
else {
DEBUGASSERT((size_t)n <= len);
nread += (size_t)n;
buf += (size_t)n;
len -= (size_t)n;
}
}
out:
CF_DATA_RESTORE(cf, save);
return nread;
}
static int ssl_cf_get_select_socks(struct Curl_cfilter *cf,