morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[core,license] allow empty cert info

Browse Source
This commit is contained in:
Armin Novak
2023-04-24 12:11:50 +02:00
committed by Martin Fleisz
parent 13e52cfae2
commit f357f1d418
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libfreerdp/core/license.c
View File

@@ -1966,8 +1966,11 @@ BOOL license_send_error_alert(rdpLicense* license, UINT32 dwErrorCode, UINT32 dw
Stream_Write_UINT32(s, dwErrorCode);
Stream_Write_UINT32(s, dwStateTransition);
if (!license_write_binary_blob(s, info))
goto fail;
if (info)
{
if (!license_write_binary_blob(s, info))
goto fail;
}
return license_send(license, s, ERROR_ALERT);
fail:
@@ -2273,10 +2276,6 @@ BOOL license_read_new_license_request_packet(rdpLicense* license, wStream* s)
WINPR_ASSERT(license);
const rdpCertInfo* info = freerdp_certificate_get_info(license->certificate);
if (!info)
return FALSE;
if (!license_check_stream_length(s, 8ull + sizeof(license->ClientRandom),
"new license request"))
return FALSE;
@@ -2295,7 +2294,10 @@ BOOL license_read_new_license_request_packet(rdpLicense* license, wStream* s)
&ModulusLength))
return FALSE;
if (ModulusLength != info->ModulusLength)
const rdpCertInfo* info = freerdp_certificate_get_info(license->certificate);
if (!info)
WLog_WARN(TAG, "Missing license certificate, skipping ModulusLength checks");
else if (ModulusLength != info->ModulusLength)
{
WLog_WARN(TAG,
"EncryptedPremasterSecret expected to be %" PRIu32 " bytes, but read %" PRIu32