--- sourceforge.net/trunk/rdesktop/secure.c 2003/05/30 21:44:06 380 +++ sourceforge.net/trunk/rdesktop/secure.c 2004/01/23 08:35:52 580 @@ -34,13 +34,17 @@ #endif extern char hostname[16]; -extern int width; -extern int height; +extern int g_width; +extern int g_height; extern int keylayout; -extern BOOL encryption; +extern BOOL g_encryption; extern BOOL g_licence_issued; -extern BOOL use_rdp5; -extern int server_bpp; +extern BOOL g_use_rdp5; +extern BOOL g_console_session; +extern int g_server_bpp; +extern uint16 mcs_userid; +extern VCHANNEL g_channels[]; +extern unsigned int g_num_channels; static int rc4_key_len; static RC4_KEY rc4_decrypt_key; @@ -54,7 +58,7 @@ static uint8 sec_encrypt_update_key[16]; static uint8 sec_crypted_random[SEC_MODULUS_SIZE]; -uint16 server_rdp_version = 0; +uint16 g_server_rdp_version = 0; /* * General purpose 48-byte transformation, using two 32-byte salts (generally, @@ -340,9 +344,9 @@ return s; } -/* Transmit secure transport packet */ +/* Transmit secure transport packet over specified channel */ void -sec_send(STREAM s, uint32 flags) +sec_send_to_channel(STREAM s, uint32 flags, uint16 channel) { int datalen; @@ -364,9 +368,18 @@ sec_encrypt(s->p + 8, datalen); } - mcs_send(s); + mcs_send_to_channel(s, channel); } +/* Transmit secure transport packet */ + +void +sec_send(STREAM s, uint32 flags) +{ + sec_send_to_channel(s, flags, MCS_GLOBAL_CHANNEL); +} + + /* Transfer the client random to the server */ static void sec_establish_key(void) @@ -390,7 +403,11 @@ sec_out_mcs_data(STREAM s) { int hostlen = 2 * strlen(hostname); - int length = 158 + 76 + 12 + 4 + 20; + int length = 158 + 76 + 12 + 4; + unsigned int i; + + if (g_num_channels > 0) + length += g_num_channels * 12 + 8; if (hostlen > 30) hostlen = 30; @@ -414,10 +431,10 @@ /* Client information */ out_uint16_le(s, SEC_TAG_CLI_INFO); out_uint16_le(s, 212); /* length */ - out_uint16_le(s, use_rdp5 ? 4 : 1); /* RDP version. 1 == RDP4, 4 == RDP5. */ + out_uint16_le(s, g_use_rdp5 ? 4 : 1); /* RDP version. 1 == RDP4, 4 == RDP5. */ out_uint16_le(s, 8); - out_uint16_le(s, width); - out_uint16_le(s, height); + out_uint16_le(s, g_width); + out_uint16_le(s, g_height); out_uint16_le(s, 0xca01); out_uint16_le(s, 0xaa03); out_uint32_le(s, keylayout); @@ -432,7 +449,7 @@ out_uint32_le(s, 12); out_uint8s(s, 64); /* reserved? 4 + 12 doublewords */ - switch (server_bpp) + switch (g_server_bpp) { case 8: out_uint16_le(s, 0xca01); @@ -450,7 +467,7 @@ out_uint16_le(s, 1); out_uint32(s, 0); - out_uint8(s, server_bpp); + out_uint8(s, g_server_bpp); out_uint16_le(s, 0x0700); out_uint8(s, 0); out_uint32_le(s, 1); @@ -458,21 +475,28 @@ out_uint16_le(s, SEC_TAG_CLI_4); out_uint16_le(s, 12); - out_uint32_le(s, 9); + out_uint32_le(s, g_console_session ? 0xb : 9); out_uint32(s, 0); /* Client encryption settings */ out_uint16_le(s, SEC_TAG_CLI_CRYPT); out_uint16_le(s, 12); /* length */ - out_uint32_le(s, encryption ? 0x3 : 0); /* encryption supported, 128-bit supported */ + out_uint32_le(s, g_encryption ? 0x3 : 0); /* encryption supported, 128-bit supported */ out_uint32(s, 0); /* Unknown */ - out_uint16_le(s, SEC_TAG_CLI_CHANNELS); - out_uint16_le(s, 20); /* length */ - out_uint32_le(s, 1); /* number of virtual channels */ - out_uint8p(s, "cliprdr", 8); /* name padded to 8(?) */ - out_uint16(s, 0); - out_uint16_le(s, 0xc0a0); /* Flags. Rumours tell this is documented in MSDN. */ + DEBUG_RDP5(("g_num_channels is %d\n", g_num_channels)); + if (g_num_channels > 0) + { + out_uint16_le(s, SEC_TAG_CLI_CHANNELS); + out_uint16_le(s, g_num_channels * 12 + 8); /* length */ + out_uint32_le(s, g_num_channels); /* number of virtual channels */ + for (i = 0; i < g_num_channels; i++) + { + DEBUG_RDP5(("Requesting channel %s\n", g_channels[i].name)); + out_uint8a(s, g_channels[i].name, 8); + out_uint32_be(s, g_channels[i].flags); + } + } s_mark_end(s); } @@ -563,7 +587,7 @@ if (end > s->end) return False; - in_uint32_le(s, flags); /* 1 = RDP4-style, 0x80000002 = X.509 */ + in_uint32_le(s, flags); /* 1 = RDP4-style, 0x80000002 = X.509 */ if (flags & 1) { DEBUG_RDP5(("We're going for the RDP4-style encryption\n")); @@ -601,8 +625,38 @@ } else { + uint32 certcount; + DEBUG_RDP5(("We're going for the RDP5-style encryption\n")); - in_uint8s(s, 4); /* Number of certificates */ + in_uint32_le(s, certcount); /* Number of certificates */ + + if (certcount < 2) + { + error("Server didn't send enough X509 certificates\n"); + return False; + } + + for (; certcount > 2; certcount--) + { /* ignore all the certificates between the root and the signing CA */ + uint32 ignorelen; + X509 *ignorecert; + + DEBUG_RDP5(("Ignored certs left: %d\n", certcount)); + + in_uint32_le(s, ignorelen); + DEBUG_RDP5(("Ignored Certificate length is %d\n", ignorelen)); + ignorecert = d2i_X509(NULL, &(s->p), ignorelen); + + if (ignorecert == NULL) + { /* XXX: error out? */ + DEBUG_RDP5(("got a bad cert: this will probably screw up the rest of the communication\n")); + } + +#ifdef WITH_DEBUG_RDP5 + DEBUG_RDP5(("cert #%d (ignored):\n", certcount)); + X509_print_fp(stdout, ignorecert); +#endif + } /* Do da funky X.509 stuffy @@ -614,6 +668,7 @@ */ in_uint32_le(s, cacert_len); + DEBUG_RDP5(("CA Certificate length is %d\n", cacert_len)); cacert = d2i_X509(NULL, &(s->p), cacert_len); /* Note: We don't need to move s->p here - d2i_X509 is "kind" enough to do it for us */ @@ -634,6 +689,7 @@ */ in_uint32_le(s, cert_len); + DEBUG_RDP5(("Certificate length is %d\n", cert_len)); server_cert = d2i_X509(NULL, &(s->p), cert_len); if (NULL == server_cert) { @@ -673,15 +729,16 @@ } DEBUG(("Generating client random\n")); - // This is what the MS client do: + /* Generate a client random, and hence determine encryption keys */ + /* This is what the MS client do: */ memset(inr, 0, SEC_RANDOM_SIZE); /* *ARIGL!* Plaintext attack, anyone? - I tried doing: - generate_random(inr); - ..but that generates connection errors now and then (yes, - "now and then". Something like 0 to 3 attempts needed before a - successful connection. Nice. Not! - */ + I tried doing: + generate_random(inr); + ..but that generates connection errors now and then (yes, + "now and then". Something like 0 to 3 attempts needed before a + successful connection. Nice. Not! + */ generate_random(client_random); if (NULL != server_public_key) @@ -710,8 +767,10 @@ static void sec_process_srv_info(STREAM s) { - in_uint16_le(s, server_rdp_version); - DEBUG_RDP5(("Server RDP version is %d\n", server_rdp_version)); + in_uint16_le(s, g_server_rdp_version); + DEBUG_RDP5(("Server RDP version is %d\n", g_server_rdp_version)); + if (1 == g_server_rdp_version) + g_use_rdp5 = 0; } @@ -744,13 +803,16 @@ sec_process_srv_info(s); break; - case SEC_TAG_SRV_3: - break; - case SEC_TAG_SRV_CRYPT: sec_process_crypt_info(s); break; + case SEC_TAG_SRV_CHANNELS: + /* FIXME: We should parse this information and + use it to map RDP5 channels to MCS + channels */ + break; + default: unimpl("response tag 0x%x\n", tag); } @@ -769,33 +831,30 @@ while ((s = mcs_recv(&channel)) != NULL) { - if (encryption || !g_licence_issued) + if (g_encryption || !g_licence_issued) { in_uint32_le(s, sec_flags); - if (sec_flags & SEC_LICENCE_NEG) - { - if (sec_flags & SEC_ENCRYPT) { - DEBUG_RDP5(("Encrypted license detected\n")); - } - licence_process(s); - continue; - } - if (sec_flags & SEC_ENCRYPT) { in_uint8s(s, 8); /* signature */ sec_decrypt(s->p, s->end - s->p); } + + if (sec_flags & SEC_LICENCE_NEG) + { + licence_process(s); + continue; + } } - if (MCS_GLOBAL_CHANNEL == channel) + if (channel != MCS_GLOBAL_CHANNEL) { - return s; + channel_process(s, channel); + continue; } - else - rdp5_process_channel(s, channel); + return s; } return NULL; @@ -809,14 +868,14 @@ /* We exchange some RDP data during the MCS-Connect */ mcs_data.size = 512; - mcs_data.p = mcs_data.data = (uint8*)xmalloc(mcs_data.size); + mcs_data.p = mcs_data.data = (uint8 *) xmalloc(mcs_data.size); sec_out_mcs_data(&mcs_data); if (!mcs_connect(server, &mcs_data, username)) return False; - // sec_process_mcs_data(&mcs_data); - if (encryption) + /* sec_process_mcs_data(&mcs_data); */ + if (g_encryption) sec_establish_key(); xfree(mcs_data.data); return True;