static uint8 sec_encrypt_update_key[16];
static uint8 sec_crypted_random[SEC_MODULUS_SIZE];
+RSA *privkey;
+
uint16 g_server_rdp_version = 0;
/*
/* 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] = {
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++;
}
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++;
}
{
int datalen;
+// DEBUG(("sending packet to channel %u\n", channel));
+
s_pop_layer(s, sec_hdr);
// if (!g_licence_issued || (flags & SEC_ENCRYPT))
out_uint32_le(s, flags);
}
}
+extern unsigned char cacert[];
+
/* Receive secure transport packet */
STREAM
sec_recv(void)
printf("Received logon packet!\n");
rdp_get_logon_info(s);
}
+
+ 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, 8);
+ continue;
+ }
}
printf("Received MCS data on ch %u\n", channel);