projects
/
platform
/
upstream
/
freerdp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
452eb55
)
SEC_ENCRYPT check in rdp_client_connect_auto_detect
author
Armin Novak
<armin.novak@thincast.com>
Mon, 15 May 2017 11:10:10 +0000
(13:10 +0200)
committer
Armin Novak
<armin.novak@thincast.com>
Mon, 15 May 2017 11:10:10 +0000
(13:10 +0200)
Fix by @wizwizaco for #3951
libfreerdp/core/connection.c
patch
|
blob
|
history
diff --git
a/libfreerdp/core/connection.c
b/libfreerdp/core/connection.c
index
57896d2
..
b3e1ecc
100644
(file)
--- a/
libfreerdp/core/connection.c
+++ b/
libfreerdp/core/connection.c
@@
-772,6
+772,15
@@
BOOL rdp_client_connect_auto_detect(rdpRdp* rdp, wStream* s)
if (!rdp_read_security_header(s, &securityFlags))
return FALSE;
+ if (securityFlags & SEC_ENCRYPT)
+ {
+ if (!rdp_decrypt(rdp, s, length - 4, securityFlags))
+ {
+ WLog_ERR(TAG, "rdp_decrypt failed");
+ return FALSE;
+ }
+ }
+
if (rdp_recv_message_channel_pdu(rdp, s, securityFlags) == 0)
return TRUE;
}