generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

schannel: fix regression in schannel_recv

Browse Source 
https://github.com/bagder/curl/issues/244

Commit 145c263 changed the behavior when Curl_read_plain returns
CURLE_AGAIN. We now handle CURLE_AGAIN and SEC_I_CONTEXT_EXPIRED
correctly.
This commit is contained in:
Chris Araman
2015-04-29 16:08:43 -07:00
committed by Marc Hoersken
parent 4bb8bad964
commit aa99a63f03
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/vtls/schannel.c
View File

@@ -823,7 +823,7 @@ schannel_recv(struct connectdata *conn, int sockindex,
char *buf, size_t len, CURLcode *err) char *buf, size_t len, CURLcode *err)
{ {
size_t size = 0; size_t size = 0;
ssize_t nread = 0, ret = -1; ssize_t nread = 0, ret = 0;
CURLcode result; CURLcode result;
struct SessionHandle *data = conn->data; struct SessionHandle *data = conn->data;
struct ssl_connect_data *connssl = &conn->ssl[sockindex]; struct ssl_connect_data *connssl = &conn->ssl[sockindex];
@@ -884,14 +884,13 @@ schannel_recv(struct connectdata *conn, int sockindex,
size, &nread); size, &nread);
/* check for received data */ /* check for received data */
if(*err != CURLE_OK) if(*err != CURLE_OK)
ret = -1; return -1;
else { else {
if(nread > 0) if(nread > 0)
/* increase encrypted data buffer offset */ /* increase encrypted data buffer offset */
connssl->encdata_offset += nread; connssl->encdata_offset += nread;
ret = nread;
} }
infof(data, "schannel: encrypted data got %zd\n", ret); infof(data, "schannel: encrypted data got %zd\n", nread);
} }
infof(data, "schannel: encrypted data buffer: offset %zu length %zu\n", infof(data, "schannel: encrypted data buffer: offset %zu length %zu\n",
@@ -1033,8 +1032,6 @@ schannel_recv(struct connectdata *conn, int sockindex,
infof(data, "schannel: decrypted data buffer: offset %zu length %zu\n", infof(data, "schannel: decrypted data buffer: offset %zu length %zu\n",
connssl->decdata_offset, connssl->decdata_length); connssl->decdata_offset, connssl->decdata_length);
} }
else
ret = 0;
/* check if the server closed the connection */ /* check if the server closed the connection */
if(ret <= 0 && ( /* special check for Windows 2000 Professional */ if(ret <= 0 && ( /* special check for Windows 2000 Professional */