X-Git-Url: https://git.sesse.net/?p=rdpsrv;a=blobdiff_plain;f=mcs.c;h=b0ddff7dc9a4bd91a76be110b33a6cb7ea173bbd;hp=25361e8807c9bcf565dff4b05781050754f2fc8b;hb=55a546ab6b5970438e6cca1a962ec4e7dd669d11;hpb=7be717717ee2d9de221c62bfe4f1c5c1a5da1c8d

diff --git a/mcs.c b/mcs.c
index 25361e8..b0ddff7 100644
--- a/mcs.c
+++ b/mcs.c
@@ -19,10 +19,12 @@
 */
 
 #include "rdesktop.h"
+#include <openssl/rsa.h>
 
 uint16 g_mcs_userid;
 extern VCHANNEL g_channels[];
 extern unsigned int g_num_channels;
+extern RSA *privkey;
 
 /* Parse an ASN.1 BER header */
 static BOOL
@@ -277,7 +279,29 @@ unsigned char server_cert[] = {
 	0x15, 0x3c, 0xdc, 0x09, 0x4c, 0x36, 0x9a, 0x2b, 0x5e, 0xe0, 0xe6, 0x07, 0x79, 0xfd, 0xcd, 0x1d,
 	0x06, 0x63, 0xfa, 0xb4, 0x2c, 0xcc, 0x00, 0x25, 0x43, 0x71, 0x65, 0xff, 0xf7
 };
- 
+unsigned char private_key[] = {
+	0x30, 0x82, 0x01, 0x3a, 0x02, 0x01, 0x00, 0x02, 0x41, 0x00, 0xb6, 0x88, 0xff, 0x4a, 0x6d, 0x44,
+	0x59, 0x6c, 0x3a, 0xe8, 0x5b, 0x53, 0x72, 0x2e, 0x0a, 0x3f, 0x0b, 0xbf, 0x33, 0x87, 0x25, 0x30,
+	0xeb, 0x82, 0xf7, 0xd4, 0x98, 0xf1, 0x60, 0xee, 0x6e, 0x99, 0xdd, 0x6f, 0x07, 0xd9, 0xc0, 0xa1,
+	0x6c, 0x1c, 0x50, 0xd7, 0xc1, 0x18, 0xe1, 0x5e, 0x70, 0x89, 0x3e, 0x6a, 0x98, 0x2c, 0x8b, 0xef,
+	0x76, 0x6d, 0x9b, 0x70, 0xb8, 0xd7, 0x41, 0x25, 0xa1, 0x01, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02,
+	0x40, 0x1f, 0xf8, 0x02, 0x6e, 0x30, 0x90, 0xe5, 0xf0, 0x74, 0xa8, 0xb9, 0x45, 0xf6, 0x1b, 0x66,
+	0x24, 0x00, 0x94, 0xae, 0x1b, 0x9f, 0x41, 0xe0, 0x1d, 0x81, 0xf6, 0x34, 0x0b, 0x22, 0x64, 0xdf,
+	0xed, 0xbb, 0x05, 0xfb, 0x56, 0xcb, 0xb7, 0xef, 0x14, 0xf6, 0xb7, 0x62, 0xb5, 0x5c, 0xaf, 0x98,
+	0xf8, 0x90, 0x4d, 0x40, 0x4b, 0xc4, 0xf2, 0x1c, 0x79, 0xe5, 0x81, 0x4c, 0xae, 0xa9, 0x60, 0xf3,
+	0x21, 0x02, 0x21, 0x00, 0xdb, 0x74, 0x23, 0x81, 0x46, 0xa4, 0x28, 0x97, 0xc1, 0x88, 0x3f, 0x07,
+	0xbd, 0xdc, 0x39, 0xa7, 0x16, 0xff, 0x75, 0xaa, 0x5e, 0x61, 0xff, 0xe4, 0x5c, 0x0e, 0x3d, 0xbd,
+	0x05, 0x90, 0xc8, 0xbd, 0x02, 0x21, 0x00, 0xd4, 0xee, 0xed, 0xdf, 0xca, 0x71, 0xb7, 0x07, 0xb5,
+	0x87, 0xf2, 0xe7, 0xfa, 0xd9, 0xa6, 0xe3, 0x5f, 0xe5, 0x2a, 0x9a, 0xaf, 0x23, 0x88, 0xbc, 0x52,
+	0xb7, 0xad, 0x1b, 0x9d, 0x3c, 0x27, 0x95, 0x02, 0x20, 0x74, 0x47, 0x3c, 0x4c, 0xd2, 0x46, 0x46,
+	0xef, 0xe9, 0xee, 0xac, 0x1f, 0x08, 0xfd, 0x78, 0x5a, 0xcd, 0x77, 0xbc, 0x3b, 0xf2, 0x58, 0x90,
+	0xc2, 0xc9, 0xf8, 0x0d, 0xc4, 0x6a, 0xff, 0x85, 0x2d, 0x02, 0x21, 0x00, 0xa2, 0x4e, 0x79, 0x8d,
+	0x83, 0x3f, 0xc8, 0xb7, 0x1c, 0x9d, 0x42, 0xff, 0xa6, 0xcb, 0x6f, 0x15, 0x94, 0x0c, 0x17, 0xbc,
+	0x8e, 0xd1, 0x74, 0x31, 0xb0, 0x8f, 0x87, 0x69, 0x2c, 0x22, 0x25, 0x3d, 0x02, 0x20, 0x24, 0x9e,
+	0xf6, 0x03, 0x5f, 0x7e, 0x2d, 0xc7, 0x8c, 0x88, 0xf7, 0x43, 0x14, 0xb7, 0x75, 0x72, 0x1e, 0x16,
+	0xae, 0x43, 0x71, 0x97, 0xcc, 0xc2, 0x0c, 0xde, 0x63, 0x35, 0x87, 0x50, 0xbf, 0xad
+};
+
 void
 mcs_send_connect_response()
 {
@@ -321,7 +345,7 @@ mcs_send_connect_response()
 	out_uint8(s, 0x44);
 	out_uint8(s, 0x6e);
 
-	length = 106 + sizeof(cacert) + sizeof(server_cert);
+	length = 108 + sizeof(cacert) + sizeof(server_cert);
 	
 	// two bytes of length
 	out_uint8(s, 0x80 | (length >> 8));
@@ -346,12 +370,12 @@ mcs_send_connect_response()
 	// crypto info
 	out_uint16_le(s, SEC_TAG_SRV_CRYPT);
 	out_uint16_le(s, 84 + sizeof(cacert) + sizeof(server_cert)); // length
-	out_uint32_le(s, 2); // 128-bit
-	out_uint32_le(s, 3); // high
+	out_uint32_le(s, 1); // 128-bit
+	out_uint32_le(s, 2); // medium
 
 	out_uint32_le(s, SEC_RANDOM_SIZE); // random_len
 	out_uint32_le(s, 32 + sizeof(cacert) + sizeof(server_cert));             // rsa_info_len
-	out_uint8s(s, SEC_RANDOM_SIZE);    // server_random
+	out_uint8p(s, cacert, SEC_RANDOM_SIZE);    // server_"random"
 	out_uint32_le(s, 0x80000002);      // X.509
 	out_uint32_le(s, 2);               // number of certificates
 
@@ -368,6 +392,17 @@ mcs_send_connect_response()
 	s_mark_end(s);
 	iso_send(s);
 
+	// this is a good time to load our private key :-)
+	{
+		unsigned char *buf = (unsigned char *)malloc(1024);
+		const unsigned char *ptr = buf;
+		memcpy(buf, private_key, sizeof(private_key));
+		privkey = d2i_RSAPrivateKey(NULL, &ptr, sizeof(private_key));
+		RSA_blinding_off(privkey);   // fix Valgrind hits -- YES, I know it's evil
+		free(buf);
+
+		printf("Loaded private key (%u bytes)\n", sizeof(private_key));
+	}
 }
 
 /* Send an EDrq message (ASN.1 PER) */