moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-04 08:35:05 -05:00
Code Issues Releases Wiki Activity

curl_schannel.c: Fixed caching more data than required

Browse Source 
Do not fill the decrypted data buffer with more data unless
required in order to return the requested amount of data.
This commit is contained in:
Marc Hoersken 2012-10-06 15:47:14 +02:00
parent fbf3560886
commit a5b6f91e8d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/curl_schannel.c
View File

@ -863,7 +863,8 @@ schannel_recv(struct connectdata *conn, int sockindex,
connssl->encdata_offset, connssl->encdata_length); connssl->encdata_offset, connssl->encdata_length);
/* check if we still have some data in our buffers */ /* check if we still have some data in our buffers */
while(connssl->encdata_offset > 0 && sspi_status == SEC_E_OK) { while(connssl->encdata_offset > 0 && sspi_status == SEC_E_OK &&
connssl->decdata_offset < len) {
/* prepare data buffer for DecryptMessage call */ /* prepare data buffer for DecryptMessage call */
InitSecBuffer(&inbuf[0], SECBUFFER_DATA, connssl->encdata_buffer, InitSecBuffer(&inbuf[0], SECBUFFER_DATA, connssl->encdata_buffer,
curlx_uztoul(connssl->encdata_offset)); curlx_uztoul(connssl->encdata_offset));
@ -970,6 +971,9 @@ schannel_recv(struct connectdata *conn, int sockindex,
} }
} }
infof(data, "schannel: decrypted data buffer: offset %zu length %zu\n",
connssl->decdata_offset, connssl->decdata_length);
/* copy requested decrypted data to supplied buffer */ /* copy requested decrypted data to supplied buffer */
size = len < connssl->decdata_offset ? len : connssl->decdata_offset; size = len < connssl->decdata_offset ? len : connssl->decdata_offset;
if(size > 0) { if(size > 0) {
@ -980,6 +984,10 @@ schannel_recv(struct connectdata *conn, int sockindex,
memmove(connssl->decdata_buffer, connssl->decdata_buffer + size, memmove(connssl->decdata_buffer, connssl->decdata_buffer + size,
connssl->decdata_offset - size); connssl->decdata_offset - size);
connssl->decdata_offset -= size; connssl->decdata_offset -= size;
infof(data, "schannel: decrypted data returned %zd\n", size);
infof(data, "schannel: decrypted data buffer: offset %zu length %zu\n",
connssl->decdata_offset, connssl->decdata_length);
} }
/* check if the server closed the connection */ /* check if the server closed the connection */