kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sec_decrypt() the correct amount of data

Browse Source 
Save the correct amount of data to sec_decrypt() because after
inout_uint8p() the macro s_remaining(s) will find nothing left.
This commit is contained in:
Markus Beth 2019-06-11 22:57:31 +02:00 committed by Pierre Ossman
parent 6028c999ba
commit 5c900521f3
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
secure.c
View File

@ -873,6 +873,7 @@ sec_recv(RD_BOOL * is_fastpath)
STREAM s; STREAM s;
struct stream packet; struct stream packet;
size_t data_offset; size_t data_offset;
size_t remaining;
unsigned char *data; unsigned char *data;
while ((s = mcs_recv(&channel, is_fastpath, &fastpath_hdr)) != NULL) while ((s = mcs_recv(&channel, is_fastpath, &fastpath_hdr)) != NULL)
@ -894,8 +895,9 @@ sec_recv(RD_BOOL * is_fastpath)
data_offset = s_tell(s); data_offset = s_tell(s);
inout_uint8p(s, data, s_remaining(s)); remaining = s_remaining(s);
sec_decrypt(data, s_remaining(s)); inout_uint8p(s, data, remaining);
sec_decrypt(data, remaining);
s_seek(s, data_offset); s_seek(s, data_offset);
} }
@ -924,8 +926,9 @@ sec_recv(RD_BOOL * is_fastpath)
data_offset = s_tell(s); data_offset = s_tell(s);
inout_uint8p(s, data, s_remaining(s)); remaining = s_remaining(s);
sec_decrypt(data, s_remaining(s)); inout_uint8p(s, data, remaining);
sec_decrypt(data, remaining);
} }
if (sec_flags & SEC_LICENSE_PKT) if (sec_flags & SEC_LICENSE_PKT)
@ -947,8 +950,9 @@ sec_recv(RD_BOOL * is_fastpath)
data_offset = s_tell(s); data_offset = s_tell(s);
inout_uint8p(s, data, s_remaining(s)); remaining = s_remaining(s);
sec_decrypt(data, s_remaining(s)); inout_uint8p(s, data, remaining);
sec_decrypt(data, remaining);
/* Check for a redirect packet, starts with 00 04 */ /* Check for a redirect packet, starts with 00 04 */
if (data[0] == 0 && data[1] == 4) if (data[0] == 0 && data[1] == 4)