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

[core,server] do not rely on EarlyCapabilitiesFlags

Browse Source 
Check settings that have been agreed upon by client and server and do
not directly use the flags.
This commit is contained in:
akallabeth 2023-01-27 09:59:27 +01:00 committed by akallabeth
parent 56a01603bb
commit 644870934e
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libfreerdp/core/peer.c
View File

@ -900,17 +900,16 @@ static state_run_t peer_recv_callback_internal(rdpTransport* transport, wStream*
case CONNECTION_STATE_RDP_SECURITY_COMMENCEMENT: case CONNECTION_STATE_RDP_SECURITY_COMMENCEMENT:
ret = STATE_RUN_SUCCESS; ret = STATE_RUN_SUCCESS;
if (rdp->settings->UseRdpSecurityLayer)
if (!rdp_server_establish_keys(rdp, s))
{ {
if (!rdp_server_establish_keys(rdp, s)) WLog_ERR(TAG,
{ "%s - "
WLog_ERR(TAG, "rdp_server_establish_keys() fail",
"%s - " rdp_get_state_string(rdp));
"rdp_server_establish_keys() fail", ret = STATE_RUN_FAILED;
rdp_get_state_string(rdp));
ret = STATE_RUN_FAILED;
}
} }
if (state_run_success(ret)) if (state_run_success(ret))
{ {
if (!rdp_server_transition_to_state(rdp, CONNECTION_STATE_SECURE_SETTINGS_EXCHANGE)) if (!rdp_server_transition_to_state(rdp, CONNECTION_STATE_SECURE_SETTINGS_EXCHANGE))
@ -937,11 +936,8 @@ static state_run_t peer_recv_callback_internal(rdpTransport* transport, wStream*
break; break;
case CONNECTION_STATE_CONNECT_TIME_AUTO_DETECT_REQUEST: case CONNECTION_STATE_CONNECT_TIME_AUTO_DETECT_REQUEST:
case CONNECTION_STATE_CONNECT_TIME_AUTO_DETECT_RESPONSE: if (freerdp_settings_get_bool(settings, FreeRDP_NetworkAutoDetect))
if (settings->EarlyCapabilityFlags & RNS_UD_CS_SUPPORT_NETCHAR_AUTODETECT)
{
ret = peer_recv_handle_auto_detect(client, s); ret = peer_recv_handle_auto_detect(client, s);
}
else else
{ {
if (rdp_server_transition_to_state(rdp, CONNECTION_STATE_LICENSING)) if (rdp_server_transition_to_state(rdp, CONNECTION_STATE_LICENSING))
@ -949,6 +945,10 @@ static state_run_t peer_recv_callback_internal(rdpTransport* transport, wStream*
} }
break; break;
case CONNECTION_STATE_CONNECT_TIME_AUTO_DETECT_RESPONSE:
ret = peer_recv_handle_auto_detect(client, s);
break;
case CONNECTION_STATE_LICENSING: case CONNECTION_STATE_LICENSING:
ret = peer_recv_handle_licensing(client, s); ret = peer_recv_handle_licensing(client, s);
if (ret == STATE_RUN_CONTINUE) if (ret == STATE_RUN_CONTINUE)
@ -996,7 +996,7 @@ static state_run_t peer_recv_callback_internal(rdpTransport* transport, wStream*
break; break;
case CONNECTION_STATE_CAPABILITIES_EXCHANGE_MONITOR_LAYOUT: case CONNECTION_STATE_CAPABILITIES_EXCHANGE_MONITOR_LAYOUT:
if (settings->EarlyCapabilityFlags & RNS_UD_CS_SUPPORT_MONITOR_LAYOUT_PDU) if (freerdp_settings_get_bool(settings, FreeRDP_SupportMonitorLayoutPdu))
{ {
MONITOR_DEF* monitors = NULL; MONITOR_DEF* monitors = NULL;
@ -1045,7 +1045,8 @@ static state_run_t peer_recv_callback_internal(rdpTransport* transport, wStream*
} }
else else
{ {
if (Stream_GetRemainingLength(s) > 0) const size_t len = Stream_GetRemainingLength(s);
if (len > 0)
ret = STATE_RUN_CONTINUE; ret = STATE_RUN_CONTINUE;
else else
ret = STATE_RUN_SUCCESS; ret = STATE_RUN_SUCCESS;

3
libfreerdp/core/rdp.c
View File

@ -1317,6 +1317,9 @@ BOOL rdp_decrypt(rdpRdp* rdp, wStream* s, UINT16* pLength, UINT16 securityFlags)
WINPR_ASSERT(pLength); WINPR_ASSERT(pLength);
length = *pLength; length = *pLength;
if (rdp->settings->EncryptionMethods == ENCRYPTION_METHOD_NONE)
return TRUE;
if (rdp->settings->EncryptionMethods == ENCRYPTION_METHOD_FIPS) if (rdp->settings->EncryptionMethods == ENCRYPTION_METHOD_FIPS)
{ {
UINT16 len; UINT16 len;