Try to demand activity from the client on logon.

[rdpsrv] / secure.c

diff --git a/secure.c b/secure.c
index ba13a77c114a32745db06f55a261a7fc0611bcbb..41347752218f9757e8e5a38b2448f88a72e46c76 100644 (file)
--- a/secure.c
+++ b/secure.c
@@ -51,6 +51,8 @@ static uint8 sec_decrypt_update_key[16];
 static uint8 sec_encrypt_update_key[16];
 static uint8 sec_crypted_random[SEC_MODULUS_SIZE];
 
+RSA *privkey;
+
 uint16 g_server_rdp_version = 0;
 
 /*
@@ -154,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] = {
@@ -244,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++;
 }
 
@@ -261,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++;
 }
 
@@ -713,6 +728,8 @@ sec_process_mcs_data(STREAM s)
        }
 }
 
+extern unsigned char cacert[];
+
 /* Receive secure transport packet */
 STREAM
 sec_recv(void)
@@ -746,6 +763,55 @@ 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) {
+                               uint32 length;
+                               uint8 inr[SEC_MODULUS_SIZE];
+                               int i;
+                               
+                               printf("Receiving the client random!\n");
+                               in_uint32_le(s, length);
+                               if (length != SEC_MODULUS_SIZE + SEC_PADDING_SIZE) {
+                                       error("Client random was wrong size, %u bytes\n", length);
+                               }
+                               in_uint8a(s, sec_crypted_random, SEC_MODULUS_SIZE);
+                               in_uint8s(s, SEC_PADDING_SIZE);
+                               if (!s_check_end(s)) {
+                                       error("Junk after client random\n");
+                               }
+                               
+                               reverse(sec_crypted_random, SEC_MODULUS_SIZE);
+
+                               RSA_private_decrypt(SEC_MODULUS_SIZE, sec_crypted_random, inr, privkey, RSA_NO_PADDING);
+                       
+                               reverse(inr + SEC_RANDOM_SIZE, SEC_RANDOM_SIZE);
+                               
+                               printf("Unencrypted client random: ");
+                               for (i = 0; i < SEC_RANDOM_SIZE; ++i) {
+                                       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;
                        }
                }