X-Git-Url: https://git.sesse.net/?p=rdpsrv;a=blobdiff_plain;f=secure.c;h=f32a081ebd893b4a24483213829d7e6ad9aca77a;hp=fd96936e09bebc0cff5a93cc52bb4dd9f38c2965;hb=7bea59be496181e0a9968cbaa1640e5a935a8cea;hpb=b3ae47054997c61d01087d17a3ab001b0a54324b

diff --git a/secure.c b/secure.c
index fd96936..f32a081 100644
--- a/secure.c
+++ b/secure.c
@@ -343,8 +343,10 @@ sec_send_to_channel(STREAM s, uint32 flags, uint16 channel)
 {
 	int datalen;
 
+//	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)
@@ -721,23 +723,48 @@ sec_recv(void)
 
 	while ((s = mcs_recv(&channel)) != NULL)
 	{
-		if (/*g_encryption || !g_licence_issued*/ 0)
+		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)
 			{
-				licence_process(s);
+				printf("SEC_LICENSE_NEG unknown\n");
+				//licence_process(s);
 				continue;
 			}
+
+			if (sec_flags & SEC_LOGON_INFO) 
+			{
+				printf("Received logon packet!\n");
+				rdp_get_logon_info(s);
+			}
+
+			if (sec_flags & SEC_CLIENT_RANDOM) {
+				uint32 length;
+				
+				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");
+				}
+			}
 		}
 
+		printf("Received MCS data on ch %u\n", channel);
 		if (channel != MCS_GLOBAL_CHANNEL)
 		{
 			channel_process(s, channel);