X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=secure.c;h=573b77d3598112f35fe5e9bbbfa8c60cf05e4705;hb=d5d7588c8ae4d998f73076b4fdd149b206ca0e70;hp=7c90ee262538055b270f697b0c4d33008b473a64;hpb=a521f01158c829ca8f5ce87f81b85f9aa50db4dd;p=rdpsrv

diff --git a/secure.c b/secure.c
index 7c90ee2..573b77d 100644
--- 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,20 @@ sec_process_mcs_data(STREAM s)
 	}
 }
 
+extern unsigned char cacert[];
+
+unsigned char demand_license[] = {
+	0x01, 0x03, 0x86, 0x00, 0x9c, 0x6e, 0xef, 0x5a, 0x26, 0x45, 0x88, 0x86, 0x0e, 0xdf, 0xa4, 0x4a,
+	0x45, 0xc7, 0x5a, 0x4c, 0xec, 0x33, 0xff, 0x4c, 0xd8, 0x4b, 0xd2, 0x4e, 0xd2, 0x22, 0x16, 0xde,
+	0x1e, 0x5b, 0x06, 0x6e, 0x00, 0x00, 0x05, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x69, 0x00,
+	0x63, 0x00, 0x72, 0x00, 0x6f, 0x00, 0x73, 0x00, 0x6f, 0x00, 0x66, 0x00, 0x74, 0x00, 0x20, 0x00,
+	0x43, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x70, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x61, 0x00, 0x74, 0x00,
+	0x69, 0x00, 0x6f, 0x00, 0x6e, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x41, 0x00, 0x30, 0x00,
+	0x32, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xf6, 0x00, 0x00,
+	0x01, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x0e, 0x00, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x73, 0x6f, 0x66,
+	0x74, 0x2e, 0x63, 0x6f, 0x6d, 0x00
+};
+
 /* Receive secure transport packet */
 STREAM
 sec_recv(void)
@@ -748,6 +775,18 @@ sec_recv(void)
 			{
 				printf("Received logon packet!\n");
 				rdp_get_logon_info(s);
+			
+				// demand a license
+				{
+					STREAM s;
+
+					s = sec_init(sizeof(demand_license), SEC_LICENCE_NEG);
+					out_uint8p(s, demand_license, sizeof(demand_license));
+					s_mark_end(s);
+					sec_send(s, SEC_LICENCE_NEG);
+				}
+				
+				continue;
 			}
 
 			if (sec_flags & SEC_CLIENT_RANDOM) {
@@ -777,6 +816,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;
 			}
 		}