From d71c58a04b4b84e4087a28f82768a6dd1a1a35e0 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 26 May 2023 10:46:35 +0200 Subject: [PATCH] [core,licensing] allow all SEC_AUTODETECT_REQ messages follow up to fdcc36dd8d9cb7b3569a3814f70dad5e3671aa35 autodetect messages also seem to be sent over global channel id instead of message channel id --- libfreerdp/core/connection.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libfreerdp/core/connection.c b/libfreerdp/core/connection.c index bb999e155..9644f34d7 100644 --- a/libfreerdp/core/connection.c +++ b/libfreerdp/core/connection.c @@ -1180,13 +1180,14 @@ state_run_t rdp_client_connect_license(rdpRdp* rdp, wStream* s) * that has been observed with 2k12 R2 and 2k19 */ const UINT16 messageChannelId = rdp->mcs->messageChannelId; - if (channelId == messageChannelId) + if ((channelId == messageChannelId) || (securityFlags & SEC_AUTODETECT_REQ)) { return rdp_recv_message_channel_pdu(rdp, s, securityFlags); } - if (channelId != 1003) - WLog_WARN(TAG, "unexpected message for channel %u, expected %u", channelId, 1003); + if (channelId != MCS_GLOBAL_CHANNEL_ID) + WLog_WARN(TAG, "unexpected message for channel %u, expected %u", channelId, + MCS_GLOBAL_CHANNEL_ID); if ((securityFlags & SEC_LICENSE_PKT) == 0) {