kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #176 from derfian/improve-mcs-connect-initial

Browse Source 
Clarify MCS Connect Initial packet
This commit is contained in:
Henrik Andersson 2017-10-18 12:17:50 +02:00 committed by GitHub
commit 987d9c1147
2 changed files with 79 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
constants.h
View File

@ -152,10 +152,10 @@ enum MCS_PDU_TYPE
#define SEC_TAG_SRV_CRYPT 0x0c02 #define SEC_TAG_SRV_CRYPT 0x0c02
#define SEC_TAG_SRV_CHANNELS 0x0c03 #define SEC_TAG_SRV_CHANNELS 0x0c03
#define SEC_TAG_CLI_INFO 0xc001 #define CS_CORE 0xc001
#define SEC_TAG_CLI_CRYPT 0xc002 #define CS_SECURITY 0xc002
#define SEC_TAG_CLI_CHANNELS 0xc003 #define CS_NET 0xc003
#define SEC_TAG_CLI_CLUSTER 0xc004 #define CS_CLUSTER 0xc004
#define SEC_TAG_PUBKEY 0x0006 #define SEC_TAG_PUBKEY 0x0006
#define SEC_TAG_KEYSIG 0x0008 #define SEC_TAG_KEYSIG 0x0008
@ -682,6 +682,41 @@ enum RDP_PDU_REDIRECT_FLAGS
LB_TARGET_CERTIFICATE = 0x10000 LB_TARGET_CERTIFICATE = 0x10000
}; };
/* color depths, from [MS-RDPBCGR] 2.2.1.3.2 */
#define RNS_UD_COLOR_4BPP 0xCA00
#define RNS_UD_COLOR_8BPP 0xCA01
#define RNS_UD_COLOR_16BPP_555 0xCA02
#define RNS_UD_COLOR_16BPP_565 0xCA03
#define RNS_UD_COLOR_24BPP 0xCA04
#define RNS_UD_SAS_DEL 0xAA03
/* version, [MS-RDPBCGR] 2.2.1.3.2 */
#define RDP_40 0x00080001 /* RDP 4.0 clients */
#define RDP_50 0x00080004 /* RDP 5.0, 5.1, 5.2, 6.0, 6.1, 7.0, 7.1, 8.0, and 8.1 clients */
#define RDP_10_0 0x00080005 /* RDP 10.0 clients */
#define RDP_10_1 0x00080006 /* RDP 10.1 clients */
#define RDP_10_2 0x00080007 /* RDP 10.2 clients */
#define RDP_10_3 0x00080008 /* RDP 10.3 clients */
/* supportedColorDepths, [MS-RDPBCGR] 2.2.1.3.2 */
#define RNS_UD_24BPP_SUPPORT 0x0001
#define RNS_UD_16BPP_SUPPORT 0x0002
#define RNS_UD_15BPP_SUPPORT 0x0004
#define RNS_UD_32BPP_SUPPORT 0x0008
/* earlyCapabilityFlags, [MS-RDPBCGR] 2.2.1.3.2 */
#define RNS_UD_CS_SUPPORT_ERRINFO_PDU 0x0001
#define RNS_UD_CS_WANT_32BPP_SESSION 0x0002
#define RNS_UD_CS_SUPPORT_STATUSINFO_PDU 0x0004
#define RNS_UD_CS_STRONG_ASYMMETRIC_KEYS 0x0008
#define RNS_UD_CS_UNUSED 0x0010
#define RNS_UD_CS_VALID_CONNECTION_TYPE 0x0020
#define RNS_UD_CS_SUPPORT_MONITOR_LAYOUT_PDU 0x0040
#define RNS_UD_CS_SUPPORT_NETCHAR_AUTODETECT 0x0080
#define RNS_UD_CS_SUPPORT_DYNVC_GFX_PROTOCOL 0x0100
#define RNS_UD_CS_SUPPORT_DYNAMIC_TIME_ZONE 0x0200
#define RNS_UD_CS_SUPPORT_HEARTBEAT_PDU 0x0400
/* [MS-RDPBCGR] 2.2.7.1.1 */ /* [MS-RDPBCGR] 2.2.7.1.1 */
#define OSMAJORTYPE_WINDOWS 0x0001 #define OSMAJORTYPE_WINDOWS 0x0001

74
secure.c
View File

@ -389,18 +389,20 @@ sec_establish_key(void)
/* Output connect initial data blob */ /* Output connect initial data blob */
static void static void
sec_out_mcs_data(STREAM s, uint32 selected_protocol) sec_out_mcs_connect_initial_pdu(STREAM s, uint32 selected_protocol)
{ {
int hostlen = 2 * strlen(g_hostname);
int length = 162 + 76 + 12 + 4; int length = 162 + 76 + 12 + 4;
unsigned int i; unsigned int i;
uint32 rdpversion = RDP_40;
uint16 capflags = RNS_UD_CS_SUPPORT_ERRINFO_PDU;
uint16 colorsupport = RNS_UD_24BPP_SUPPORT | RNS_UD_16BPP_SUPPORT;
if (g_rdp_version >= RDP_V5)
rdpversion = RDP_50;
if (g_num_channels > 0) if (g_num_channels > 0)
length += g_num_channels * 12 + 8; length += g_num_channels * 12 + 8;
if (hostlen > 30)
hostlen = 30;
/* Generic Conference Control (T.124) ConferenceCreateRequest */ /* Generic Conference Control (T.124) ConferenceCreateRequest */
out_uint16_be(s, 5); out_uint16_be(s, 5);
out_uint16_be(s, 0x14); out_uint16_be(s, 0x14);
@ -418,41 +420,38 @@ sec_out_mcs_data(STREAM s, uint32 selected_protocol)
out_uint32_le(s, 0x61637544); /* OEM ID: "Duca", as in Ducati. */ out_uint32_le(s, 0x61637544); /* OEM ID: "Duca", as in Ducati. */
out_uint16_be(s, ((length - 14) | 0x8000)); /* remaining length */ out_uint16_be(s, ((length - 14) | 0x8000)); /* remaining length */
/* Client information */ /* Client information (TS_UD_CS_CORE) */
out_uint16_le(s, SEC_TAG_CLI_INFO); out_uint16_le(s, CS_CORE); /* type */
out_uint16_le(s, 216); /* length */ out_uint16_le(s, 216); /* length */
out_uint16_le(s, (g_rdp_version >= RDP_V5) ? 4 : 1); /* RDP version. 1 == RDP4, 4 >= RDP5 to RDP8 */ out_uint32_le(s, rdpversion); /* version */
out_uint16_le(s, 8); out_uint16_le(s, g_width); /* desktopWidth */
out_uint16_le(s, g_width); out_uint16_le(s, g_height); /* desktopHeight */
out_uint16_le(s, g_height); out_uint16_le(s, RNS_UD_COLOR_8BPP); /* colorDepth */
out_uint16_le(s, 0xca01); out_uint16_le(s, RNS_UD_SAS_DEL); /* SASSequence */
out_uint16_le(s, 0xaa03); out_uint32_le(s, g_keylayout); /* keyboardLayout */
out_uint32_le(s, g_keylayout);
out_uint32_le(s, 2600); /* Client build. We are now 2600 compatible :-) */ out_uint32_le(s, 2600); /* Client build. We are now 2600 compatible :-) */
/* Unicode name of client, padded to 32 bytes */ /* Unicode name of client, padded to 32 bytes */
out_utf16s_padded(s, g_hostname, 32, 0x00); out_utf16s_padded(s, g_hostname, 32, 0x00);
/* See out_uint32_le(s, g_keyboard_type); /* keyboardType */
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wceddk40/html/cxtsksupportingremotedesktopprotocol.asp */ out_uint32_le(s, g_keyboard_subtype); /* keyboardSubtype */
out_uint32_le(s, g_keyboard_type); out_uint32_le(s, g_keyboard_functionkeys); /* keyboardFunctionKey */
out_uint32_le(s, g_keyboard_subtype); out_uint8s(s, 64); /* imeFileName */
out_uint32_le(s, g_keyboard_functionkeys); out_uint16_le(s, RNS_UD_COLOR_8BPP); /* postBeta2ColorDepth (overrides colorDepth) */
out_uint8s(s, 64); /* reserved? 4 + 12 doublewords */ out_uint16_le(s, 1); /* clientProductId (should be 1) */
out_uint16_le(s, 0xca01); /* colour depth? */ out_uint32_le(s, 0); /* serialNumber (should be 0) */
out_uint16_le(s, 1); out_uint16_le(s, g_server_depth); /* highColorDepth (overrides postBeta2ColorDepth) */
out_uint16_le(s, colorsupport); /* supportedColorDepths */
out_uint32(s, 0); out_uint16_le(s, capflags); /* earlyCapabilityFlags */
out_uint8(s, g_server_depth); out_uint8s(s, 64); /* clientDigProductId */
out_uint16_le(s, 0x0700); out_uint8(s, 0); /* connectionType */
out_uint8(s, 0); out_uint8(s, 0); /* pad */
out_uint32_le(s, 1); out_uint32_le(s, selected_protocol); /* serverSelectedProtocol */
out_uint8s(s, 64);
out_uint32_le(s, selected_protocol); /* End of client info */
/* Write a Client Cluster Data (TS_UD_CS_CLUSTER) */ /* Write a Client Cluster Data (TS_UD_CS_CLUSTER) */
uint32 cluster_flags = 0; uint32 cluster_flags = 0;
out_uint16_le(s, SEC_TAG_CLI_CLUSTER); /* header.type */ out_uint16_le(s, CS_CLUSTER); /* header.type */
out_uint16_le(s, 12); /* length */ out_uint16_le(s, 12); /* length */
cluster_flags |= SEC_CC_REDIRECTION_SUPPORTED; cluster_flags |= SEC_CC_REDIRECTION_SUPPORTED;
@ -464,16 +463,17 @@ sec_out_mcs_data(STREAM s, uint32 selected_protocol)
out_uint32_le(s, cluster_flags); out_uint32_le(s, cluster_flags);
out_uint32(s, g_redirect_session_id); out_uint32(s, g_redirect_session_id);
/* Client encryption settings */ /* Client encryption settings (TS_UD_CS_SEC) */
out_uint16_le(s, SEC_TAG_CLI_CRYPT); out_uint16_le(s, CS_SECURITY); /* type */
out_uint16_le(s, 12); /* length */ out_uint16_le(s, 12); /* length */
out_uint32_le(s, g_encryption ? 0x3 : 0); /* encryption supported, 128-bit supported */ out_uint32_le(s, g_encryption ? 0x3 : 0); /* encryptionMethods */
out_uint32(s, 0); /* Unknown */ out_uint32(s, 0); /* extEncryptionMethods */
/* Channel definitions (TS_UD_CS_NET) */
logger(Protocol, Debug, "sec_out_mcs_data(), g_num_channels is %d", g_num_channels); logger(Protocol, Debug, "sec_out_mcs_data(), g_num_channels is %d", g_num_channels);
if (g_num_channels > 0) if (g_num_channels > 0)
{ {
out_uint16_le(s, SEC_TAG_CLI_CHANNELS); out_uint16_le(s, CS_NET); /* type */
out_uint16_le(s, g_num_channels * 12 + 8); /* length */ out_uint16_le(s, g_num_channels * 12 + 8); /* length */
out_uint32_le(s, g_num_channels); /* number of virtual channels */ out_uint32_le(s, g_num_channels); /* number of virtual channels */
for (i = 0; i < g_num_channels; i++) for (i = 0; i < g_num_channels; i++)
@ -921,7 +921,7 @@ sec_connect(char *server, char *username, char *domain, char *password, RD_BOOL
/* We exchange some RDP data during the MCS-Connect */ /* We exchange some RDP data during the MCS-Connect */
mcs_data.size = 512; 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, selected_proto); sec_out_mcs_connect_initial_pdu(&mcs_data, selected_proto);
/* finialize the MCS connect sequence */ /* finialize the MCS connect sequence */
if (!mcs_connect_finalize(&mcs_data)) if (!mcs_connect_finalize(&mcs_data))