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

Merge pull request #2711 from nfedera/nf-fix-rdprecvmessagechannelpdu

Browse Source 
core: message channel pdu broken with rdp security
This commit is contained in:
Bernhard Miklautz 2015-06-22 12:26:31 +02:00
commit b7e24309cf
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libfreerdp/core/connection.c
View File

@ -755,7 +755,12 @@ BOOL rdp_client_connect_auto_detect(rdpRdp* rdp, wStream* s)
{ {
if (channelId == rdp->mcs->messageChannelId) if (channelId == rdp->mcs->messageChannelId)
{ {
if (rdp_recv_message_channel_pdu(rdp, s) == 0) UINT16 securityFlags;
if (!rdp_read_security_header(s, &securityFlags))
return FALSE;
if (rdp_recv_message_channel_pdu(rdp, s, securityFlags) == 0)
return TRUE; return TRUE;
} }
} }

6
libfreerdp/core/peer.c
View File

@ -405,7 +405,11 @@ static int peer_recv_tpkt_pdu(freerdp_peer* client, wStream* s)
} }
else if (rdp->mcs->messageChannelId && channelId == rdp->mcs->messageChannelId) else if (rdp->mcs->messageChannelId && channelId == rdp->mcs->messageChannelId)
{ {
return rdp_recv_message_channel_pdu(rdp, s); if (!rdp->settings->UseRdpSecurityLayer)
if (!rdp_read_security_header(s, &securityFlags))
return -1;
return rdp_recv_message_channel_pdu(rdp, s, securityFlags);
} }
else else
{ {

13
libfreerdp/core/rdp.c
View File

@ -898,13 +898,8 @@ out_fail:
return -1; return -1;
} }
int rdp_recv_message_channel_pdu(rdpRdp* rdp, wStream* s) int rdp_recv_message_channel_pdu(rdpRdp* rdp, wStream* s, UINT16 securityFlags)
{ {
UINT16 securityFlags;
if (!rdp_read_security_header(s, &securityFlags))
return -1;
if (securityFlags & SEC_AUTODETECT_REQ) if (securityFlags & SEC_AUTODETECT_REQ)
{ {
/* Server Auto-Detect Request PDU */ /* Server Auto-Detect Request PDU */
@ -1162,7 +1157,11 @@ static int rdp_recv_tpkt_pdu(rdpRdp* rdp, wStream* s)
} }
else if (rdp->mcs->messageChannelId && channelId == rdp->mcs->messageChannelId) else if (rdp->mcs->messageChannelId && channelId == rdp->mcs->messageChannelId)
{ {
return rdp_recv_message_channel_pdu(rdp, s); if (!rdp->settings->UseRdpSecurityLayer)
if (!rdp_read_security_header(s, &securityFlags))
return -1;
return rdp_recv_message_channel_pdu(rdp, s, securityFlags);
} }
else else
{ {

2
libfreerdp/core/rdp.h
View File

@ -209,7 +209,7 @@ int rdp_send_channel_data(rdpRdp* rdp, UINT16 channelId, BYTE* data, int size);
wStream* rdp_message_channel_pdu_init(rdpRdp* rdp); wStream* rdp_message_channel_pdu_init(rdpRdp* rdp);
BOOL rdp_send_message_channel_pdu(rdpRdp* rdp, wStream* s, UINT16 sec_flags); BOOL rdp_send_message_channel_pdu(rdpRdp* rdp, wStream* s, UINT16 sec_flags);
int rdp_recv_message_channel_pdu(rdpRdp* rdp, wStream* s); int rdp_recv_message_channel_pdu(rdpRdp* rdp, wStream* s, UINT16 securityFlags);
int rdp_recv_out_of_sequence_pdu(rdpRdp* rdp, wStream* s); int rdp_recv_out_of_sequence_pdu(rdpRdp* rdp, wStream* s);