If we are server, our encryption key is client's decryption key and vice-versa.

diff --git a/libfreerdp-core/security.c b/libfreerdp-core/security.c
index 77879da..0b17d7d 100644 (file)
--- a/libfreerdp-core/security.c
+++ b/libfreerdp-core/security.c
@@ -347,8 +347,17 @@ boolean security_establish_keys(uint8* client_random, rdpRdp* rdp)
 
        memcpy(rdp->sign_key, session_key_blob, 16);
 
-       security_md5_16_32_32(&session_key_blob[16], client_random, server_random, rdp->decrypt_key);
-       security_md5_16_32_32(&session_key_blob[32], client_random, server_random, rdp->encrypt_key);
+       if (rdp->settings->server_mode) {
+               security_md5_16_32_32(&session_key_blob[16], client_random,
+                   server_random, rdp->encrypt_key);
+               security_md5_16_32_32(&session_key_blob[32], client_random,
+                   server_random, rdp->decrypt_key);
+       } else {
+               security_md5_16_32_32(&session_key_blob[16], client_random,
+                   server_random, rdp->decrypt_key);
+               security_md5_16_32_32(&session_key_blob[32], client_random,
+                   server_random, rdp->encrypt_key);
+       }
 
        if (settings->encryption_method == 1) /* 40 and 56 bit */
        {