mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[core,rdp] add log messages for unexpected data

Browse Source
This commit is contained in:
akallabeth 2023-08-25 08:12:53 +02:00 committed by akallabeth
parent 76609529e0
commit feb5ab52cb
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libfreerdp/core/rdp.c
View File

@ -1387,21 +1387,27 @@ BOOL rdp_decrypt(rdpRdp* rdp, wStream* s, UINT16* pLength, UINT16 securityFlags)
if (rdp->settings->EncryptionMethods == ENCRYPTION_METHOD_FIPS)
{
UINT16 len;
BYTE version, pad;
const BYTE* sig;
INT64 padLength;
if (!Stream_CheckAndLogRequiredLengthWLog(rdp->log, s, 12))
goto unlock;
UINT16 len = 0;
Stream_Read_UINT16(s, len); /* 0x10 */
if (len != 0x10)
WLog_Print(rdp->log, WLOG_WARN, "ENCRYPTION_METHOD_FIPS length %" PRIu16 " != 0x10",
len);
UINT16 version = 0;
Stream_Read_UINT8(s, version); /* 0x1 */
if (version != 1)
WLog_Print(rdp->log, WLOG_WARN, "ENCRYPTION_METHOD_FIPS version %" PRIu16 " != 1",
version);
BYTE pad = 0;
Stream_Read_UINT8(s, pad);
sig = Stream_ConstPointer(s);
const BYTE* sig = Stream_ConstPointer(s);
Stream_Seek(s, 8); /* signature */
length -= 12;
padLength = length - pad;
const INT32 padLength = length - pad;
if ((length <= 0) || (padLength <= 0) || (padLength > UINT16_MAX))
{