github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for SEC_SECURE_CHECKSUM and FASTPATH_OUTPUT_SECURE_CHECKSUM flags.

Browse Source
This commit is contained in:
Pawel Jakub Dawidek 2012-01-24 15:58:30 +01:00
parent 4df52d7a42
commit e2be360ec4
4 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libfreerdp-core/capabilities.c
View File

@ -1801,14 +1801,9 @@ boolean rdp_recv_demand_active(rdpRdp* rdp, STREAM* s)
if (rdp->settings->encryption) if (rdp->settings->encryption)
{ {
rdp_read_security_header(s, &securityFlags); rdp_read_security_header(s, &securityFlags);
if (securityFlags & SEC_SECURE_CHECKSUM)
{
printf("Error: TODO\n");
return false;
}
if (securityFlags & SEC_ENCRYPT) if (securityFlags & SEC_ENCRYPT)
{ {
if (!rdp_decrypt(rdp, s, length - 4)) if (!rdp_decrypt(rdp, s, length - 4, securityFlags))
{ {
printf("rdp_decrypt failed\n"); printf("rdp_decrypt failed\n");
return false; return false;

2
libfreerdp-core/peer.c
View File

@ -169,7 +169,7 @@ static boolean peer_recv_fastpath_pdu(freerdp_peer* client, STREAM* s)
if (fastpath->encryptionFlags & FASTPATH_OUTPUT_ENCRYPTED) if (fastpath->encryptionFlags & FASTPATH_OUTPUT_ENCRYPTED)
{ {
rdp_decrypt(rdp, s, length); rdp_decrypt(rdp, s, length, (fastpath->encryptionFlags & FASTPATH_OUTPUT_SECURE_CHECKSUM) ? SEC_SECURE_CHECKSUM : 0);
} }
return fastpath_recv_inputs(fastpath, s); return fastpath_recv_inputs(fastpath, s);

28
libfreerdp-core/rdp.c
View File

@ -312,6 +312,9 @@ static uint32 rdp_security_stream_out(rdpRdp* rdp, STREAM* s, int length)
{ {
data = s->p + 8; data = s->p + 8;
length = length - (data - s->data); length = length - (data - s->data);
if (sec_flags & SEC_SECURE_CHECKSUM)
security_salted_mac_signature(rdp, data, length, true, s->p);
else
security_mac_signature(rdp, data, length, s->p); security_mac_signature(rdp, data, length, s->p);
stream_seek(s, 8); stream_seek(s, 8);
security_encrypt(s->p, length, rdp); security_encrypt(s->p, length, rdp);
@ -575,7 +578,7 @@ boolean rdp_recv_out_of_sequence_pdu(rdpRdp* rdp, STREAM* s)
* @param length int * @param length int
*/ */
boolean rdp_decrypt(rdpRdp* rdp, STREAM* s, int length) boolean rdp_decrypt(rdpRdp* rdp, STREAM* s, int length, uint16 securityFlags)
{ {
uint8 cmac[8], wmac[8]; uint8 cmac[8], wmac[8];
@ -614,10 +617,20 @@ boolean rdp_decrypt(rdpRdp* rdp, STREAM* s, int length)
stream_read(s, wmac, sizeof(wmac)); stream_read(s, wmac, sizeof(wmac));
length -= sizeof(wmac); length -= sizeof(wmac);
security_decrypt(s->p, length, rdp); security_decrypt(s->p, length, rdp);
if (securityFlags & SEC_SECURE_CHECKSUM)
security_salted_mac_signature(rdp, s->p, length, false, cmac);
else
security_mac_signature(rdp, s->p, length, cmac); security_mac_signature(rdp, s->p, length, cmac);
if (memcmp(wmac, cmac, sizeof(wmac)) != 0) { if (memcmp(wmac, cmac, sizeof(wmac)) != 0) {
printf("FATAL: invalid packet signature\n"); printf("WARNING: invalid packet signature\n");
return false; /*
* Because Standard RDP Security is totally broken,
* and cannot protect against MITM, don't treat signature
* verification failure as critical. This at least enables
* us to work with broken RDP clients and servers that
* generate invalid signatures.
*/
//return false;
} }
return true; return true;
} }
@ -646,14 +659,9 @@ static boolean rdp_recv_tpkt_pdu(rdpRdp* rdp, STREAM* s)
if (rdp->settings->encryption) if (rdp->settings->encryption)
{ {
rdp_read_security_header(s, &securityFlags); rdp_read_security_header(s, &securityFlags);
if (securityFlags & SEC_SECURE_CHECKSUM)
{
printf("Error: TODO\n");
return false;
}
if (securityFlags & (SEC_ENCRYPT|SEC_REDIRECTION_PKT)) if (securityFlags & (SEC_ENCRYPT|SEC_REDIRECTION_PKT))
{ {
if (!rdp_decrypt(rdp, s, length - 4)) if (!rdp_decrypt(rdp, s, length - 4, securityFlags))
{ {
printf("rdp_decrypt failed\n"); printf("rdp_decrypt failed\n");
return false; return false;
@ -721,7 +729,7 @@ static boolean rdp_recv_fastpath_pdu(rdpRdp* rdp, STREAM* s)
if (fastpath->encryptionFlags & FASTPATH_OUTPUT_ENCRYPTED) if (fastpath->encryptionFlags & FASTPATH_OUTPUT_ENCRYPTED)
{ {
rdp_decrypt(rdp, s, length); rdp_decrypt(rdp, s, length, (fastpath->encryptionFlags & FASTPATH_OUTPUT_SECURE_CHECKSUM) ? SEC_SECURE_CHECKSUM : 0);
} }
return fastpath_recv_updates(rdp->fastpath, s); return fastpath_recv_updates(rdp->fastpath, s);

2
libfreerdp-core/rdp.h
View File

@ -198,6 +198,6 @@ void rdp_free(rdpRdp* rdp);
#define DEBUG_RDP(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__) #define DEBUG_RDP(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__)
#endif #endif
boolean rdp_decrypt(rdpRdp* rdp, STREAM* s, int length); boolean rdp_decrypt(rdpRdp* rdp, STREAM* s, int length, uint16 securityFlags);
#endif /* __RDP_H */ #endif /* __RDP_H */