Try to demand activity from the client on logon.

[rdpsrv] / secure.c

diff --git a/secure.c b/secure.c
index 7c90ee262538055b270f697b0c4d33008b473a64..41347752218f9757e8e5a38b2448f88a72e46c76 100644 (file)
--- a/secure.c
+++ b/secure.c
@@ -156,6 +156,19 @@ sec_generate_keys(uint8 * client_key, uint8 * server_key, int rc4_key_size)
        /* Initialise RC4 state arrays */
        RC4_set_key(&rc4_decrypt_key, rc4_key_len, sec_decrypt_key);
        RC4_set_key(&rc4_encrypt_key, rc4_key_len, sec_encrypt_key);
+
+       {
+               int i;
+               printf("sec_decrypt_key: ");
+               for (i = 0; i < 16; ++i)
+                       printf("0x%02x ", sec_decrypt_key[i]);
+               printf("\n");
+               
+               printf("sec_encrypt_key: ");
+               for (i = 0; i < 16; ++i)
+                       printf("0x%02x ", sec_encrypt_key[i]);
+               printf("\n");
+       }
 }
 
 static uint8 pad_54[40] = {
@@ -246,12 +259,12 @@ sec_encrypt(uint8 * data, int length)
 
        if (use_count == 4096)
        {
-               sec_update(sec_encrypt_key, sec_encrypt_update_key);
-               RC4_set_key(&rc4_encrypt_key, rc4_key_len, sec_encrypt_key);
+               sec_update(sec_decrypt_key, sec_decrypt_update_key);
+               RC4_set_key(&rc4_decrypt_key, rc4_key_len, sec_decrypt_key);
                use_count = 0;
        }
 
-       RC4(&rc4_encrypt_key, length, data, data);
+       RC4(&rc4_decrypt_key, length, data, data);
        use_count++;
 }
 
@@ -263,12 +276,12 @@ sec_decrypt(uint8 * data, int length)
 
        if (use_count == 4096)
        {
-               sec_update(sec_decrypt_key, sec_decrypt_update_key);
-               RC4_set_key(&rc4_decrypt_key, rc4_key_len, sec_decrypt_key);
+               sec_update(sec_encrypt_key, sec_encrypt_update_key);
+               RC4_set_key(&rc4_encrypt_key, rc4_key_len, sec_encrypt_key);
                use_count = 0;
        }
 
-       RC4(&rc4_decrypt_key, length, data, data);
+       RC4(&rc4_encrypt_key, length, data, data);
        use_count++;
 }
 
@@ -715,6 +728,8 @@ sec_process_mcs_data(STREAM s)
        }
 }
 
+extern unsigned char cacert[];
+
 /* Receive secure transport packet */
 STREAM
 sec_recv(void)
@@ -748,6 +763,22 @@ sec_recv(void)
                        {
                                printf("Received logon packet!\n");
                                rdp_get_logon_info(s);
+                       
+                               // demand activity
+                               {
+                                       STREAM s;
+
+                                       s = sec_init(g_encryption ? SEC_ENCRYPT : 0, 10);
+                                       out_uint16_le(s, 10);
+                                       out_uint16_le(s, (RDP_PDU_DEMAND_ACTIVE | 0x10));
+                                       out_uint16_le(s, 1001);
+
+                                       out_uint32_le(s, 0x103ea);
+                                       s_mark_end(s);
+                                       sec_send(s, g_encryption ? SEC_ENCRYPT : 0);
+                               }
+
+                               continue;
                        }
 
                        if (sec_flags & SEC_CLIENT_RANDOM) {
@@ -777,6 +808,10 @@ sec_recv(void)
                                        printf("0x%x ", inr[i + SEC_RANDOM_SIZE]);
                                }
                                printf("\n");
+
+                               // now we can generate the keys
+                               sec_generate_keys(inr + SEC_RANDOM_SIZE, cacert, 1);
+                               continue;
                        }
                }