X-Git-Url: https://git.sesse.net/?p=rdpsrv;a=blobdiff_plain;f=secure.c;h=cf9867664a9a155e32c07bfa5d331757dd881133;hp=41347752218f9757e8e5a38b2448f88a72e46c76;hb=HEAD;hpb=7ca0c329125614fd191db809987a364a7538bcaa

diff --git a/secure.c b/secure.c
index 4134775..cf98676 100644
--- a/secure.c
+++ b/secure.c
@@ -31,7 +31,7 @@ extern int g_width;
 extern int g_height;
 extern int keylayout;
 extern BOOL g_encryption;
-extern BOOL g_licence_issued;
+BOOL g_licence_issued;
 extern BOOL g_use_rdp5;
 extern BOOL g_console_session;
 extern int g_server_bpp;
@@ -39,12 +39,12 @@ extern uint16 mcs_userid;
 extern VCHANNEL g_channels[];
 extern unsigned int g_num_channels;
 
-static int rc4_key_len;
+int rc4_key_len;
 static RC4_KEY rc4_decrypt_key;
 static RC4_KEY rc4_encrypt_key;
 static RSA *server_public_key;
 
-static uint8 sec_sign_key[16];
+uint8 sec_sign_key[16];
 static uint8 sec_decrypt_key[16];
 static uint8 sec_encrypt_key[16];
 static uint8 sec_decrypt_update_key[16];
@@ -169,6 +169,8 @@ sec_generate_keys(uint8 * client_key, uint8 * server_key, int rc4_key_size)
 			printf("0x%02x ", sec_encrypt_key[i]);
 		printf("\n");
 	}
+
+	g_encryption = 1;
 }
 
 static uint8 pad_54[40] = {
@@ -252,7 +254,7 @@ sec_update(uint8 * key, uint8 * update_key)
 }
 
 /* Encrypt data using RC4 */
-static void
+void
 sec_encrypt(uint8 * data, int length)
 {
 	static int use_count;
@@ -342,10 +344,11 @@ sec_init(uint32 flags, int maxlen)
 	int hdrlen;
 	STREAM s;
 
-	/*if (!g_licence_issued) */
+	if (!g_licence_issued) 
 		hdrlen = (flags & SEC_ENCRYPT) ? 12 : 4;
-/*	else
-		hdrlen = (flags & SEC_ENCRYPT) ? 12 : 0; */
+	else
+		hdrlen = (flags & SEC_ENCRYPT) ? 12 : 0; 
+	printf("HDRLEN is %u\n", hdrlen);
 	s = mcs_init(maxlen + hdrlen);
 	s_push_layer(s, sec_hdr, hdrlen);
 
@@ -361,20 +364,22 @@ sec_send_to_channel(STREAM s, uint32 flags, uint16 channel)
 //	DEBUG(("sending packet to channel %u\n", channel));
 	
 	s_pop_layer(s, sec_hdr);
-//	if (!g_licence_issued || (flags & SEC_ENCRYPT))
+	if (!g_licence_issued || (flags & SEC_ENCRYPT)) {
 		out_uint32_le(s, flags);
+	}
 
 	if (flags & SEC_ENCRYPT)
 	{
 		flags &= ~SEC_ENCRYPT;
 		datalen = s->end - s->p - 8;
 
-#if WITH_DEBUG
+#if WITH_DEBUG && 0
 		DEBUG(("Sending encrypted packet:\n"));
 		hexdump(s->p + 8, datalen);
 #endif
 
 		sec_sign(s->p, 8, sec_sign_key, rc4_key_len, s->p + 8, datalen);
+		printf("First byte of signature is 0x%x, at %p\n", (s->p)[0], s->p);
 		sec_encrypt(s->p + 8, datalen);
 	}
 
@@ -729,6 +734,37 @@ sec_process_mcs_data(STREAM s)
 }
 
 extern unsigned char cacert[];
+extern BOOL g_licence_issued;
+
+unsigned char result_license[] = {
+        0xff, 0x03, 0x10, 0x00, 0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xa0, 0x5f, 0x00, 0x00
+};
+unsigned char demand_active[] = {
+	0x24, 0x01, 0x11, 0x00, 0xea, 0x03, 0xea, 0x03, 0x01, 0x00, 0x04, 0x00, 0x0e, 0x01, 0x52, 0x44,
+	0x50, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x08, 0x00, 0xea, 0x03, 0x40, 0xe4, 0x01, 0x00,
+	0x18, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x11, 0x04, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0e, 0x00, 0x04, 0x00, 0x02, 0x00, 0x1c, 0x00, 0x08, 0x00,
+	0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x20, 0x03, 0x58, 0x02, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00,
+	0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x42, 0x0f, 0x00, 0x01, 0x00,
+	0x14, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x22, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
+	0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0xa1, 0x06, 0x00, 0x00, 0x40, 0x42,
+	0x0f, 0x00, 0x40, 0x42, 0x0f, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00,
+	0x08, 0x00, 0x06, 0x00, 0x00, 0x00, 0x12, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00,
+	0x0a, 0x00, 0x01, 0x00, 0x19, 0x00, 0x19, 0x00, 0x0d, 0x00, 0x58, 0x00, 0x35, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xed, 0xbf, 0xa5, 0xcd, 0xb1, 0xae, 0xbe,
+	0x88, 0x35, 0x56, 0xe5, 0xc2, 0x01, 0xaf, 0xbe, 0xc8, 0xed, 0xbf, 0xa5, 0x8c, 0x33, 0x40, 0xe4,
+	0x08, 0x30, 0x40, 0xe4, 0x01, 0x00, 0x00, 0x00, 0x08, 0x30, 0x40, 0xe4, 0x00, 0x00, 0x00, 0x00,
+	0xc0, 0xed, 0xbf, 0xa5, 0x34, 0xf5, 0xae, 0xbe, 0x08, 0x30, 0x40, 0xe4, 0xb4, 0xed, 0xbf, 0xa5,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x19, 0x00, 0x19, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00
+};
+
+#define EXPECT8(value) { in_uint8(s, unknown); if (unknown != (value)) printf("Unknown value on code line %u; expected 0x%x, got 0x%x\n", __LINE__, (value), unknown); }
+#define EXPECT16(value) { in_uint16_le(s, unknown); if (unknown != (value)) printf("Unknown value on code line %u; expected 0x%x, got 0x%x\n", __LINE__, (value), unknown); }
+#define EXPECT32(value) { in_uint32_le(s, unknown); if (unknown != (value)) printf("Unknown value on code line %u; expected 0x%x, got 0x%x\n", __LINE__, (value), unknown); }
+
 
 /* Receive secure transport packet */
 STREAM
@@ -738,47 +774,51 @@ sec_recv(void)
 	uint16 channel;
 	STREAM s;
 
-	while ((s = mcs_recv(&channel)) != NULL)
+	if ((s = mcs_recv(&channel)) != NULL)
 	{
 		if (/*g_encryption || !g_licence_issued*/ 1)
 		{
 			in_uint32_le(s, sec_flags);
-			printf("sec_flags=%x\n", sec_flags);
 			
 			if (sec_flags & SEC_ENCRYPT)
 			{
-				printf("encrypt\n");
 				in_uint8s(s, 8);	/* signature */
 				sec_decrypt(s->p, s->end - s->p);
 			}
 
 			if (sec_flags & SEC_LICENCE_NEG)
 			{
-				printf("SEC_LICENSE_NEG unknown\n");
-				//licence_process(s);
-				continue;
+				uint8 tag;
+				in_uint8(s, tag);
+			
+				printf("License tag %x, unimplemented\n", tag);
+				
+				return NULL;
 			}
 
 			if (sec_flags & SEC_LOGON_INFO) 
 			{
-				printf("Received logon packet!\n");
 				rdp_get_logon_info(s);
+				
+				// say "licensing is OK", then demand
+				// activity
+				{
+					STREAM s;
+					s = sec_init(SEC_LICENCE_NEG, sizeof(result_license));
+					out_uint8p(s, result_license, sizeof(result_license));
+					s_mark_end(s);
+					sec_send(s, SEC_LICENCE_NEG);
+				}
 			
-				// 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 = sec_init(SEC_ENCRYPT, sizeof(demand_active));
+					out_uint8p(s, demand_active, sizeof(demand_active));
 					s_mark_end(s);
-					sec_send(s, g_encryption ? SEC_ENCRYPT : 0);
+					sec_send(s, SEC_ENCRYPT);
 				}
 
-				continue;
+				return NULL;
 			}
 
 			if (sec_flags & SEC_CLIENT_RANDOM) {
@@ -786,7 +826,6 @@ sec_recv(void)
 				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);
@@ -811,7 +850,7 @@ sec_recv(void)
 
 				// now we can generate the keys
 				sec_generate_keys(inr + SEC_RANDOM_SIZE, cacert, 1);
-				continue;
+				return NULL;
 			}
 		}
 
@@ -819,7 +858,7 @@ sec_recv(void)
 		if (channel != MCS_GLOBAL_CHANNEL)
 		{
 			channel_process(s, channel);
-			continue;
+			return NULL;
 		}
 
 		return s;