summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libxrdp/libxrdp.h5
-rw-r--r--libxrdp/xrdp_mcs.c11
-rw-r--r--libxrdp/xrdp_rdp.c226
-rw-r--r--libxrdp/xrdp_sec.c530
4 files changed, 508 insertions, 264 deletions
diff --git a/libxrdp/libxrdp.h b/libxrdp/libxrdp.h
index 117c9f7f..9ae839e6 100644
--- a/libxrdp/libxrdp.h
+++ b/libxrdp/libxrdp.h
@@ -116,6 +116,11 @@ struct xrdp_sec
char pri_exp[64];
int channel_code;
int multimon;
+ char fips_encrypt_key[24];
+ char fips_decrypt_key[24];
+ char fips_sign_key[20];
+ void* encrypt_fips_info;
+ void* decrypt_fips_info;
};
/* channel */
diff --git a/libxrdp/xrdp_mcs.c b/libxrdp/xrdp_mcs.c
index c145158c..02b8ee69 100644
--- a/libxrdp/xrdp_mcs.c
+++ b/libxrdp/xrdp_mcs.c
@@ -1,7 +1,7 @@
/**
* xrdp: A Remote Desktop Protocol server.
*
- * Copyright (C) Jay Sorg 2004-2013
+ * Copyright (C) Jay Sorg 2004-2014
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -946,16 +946,17 @@ xrdp_mcs_send(struct xrdp_mcs *self, struct stream *s, int chan)
* Internal help function to close the socket
* @param self
*/
-void close_rdp_socket(struct xrdp_mcs *self)
+void APP_CC
+close_rdp_socket(struct xrdp_mcs *self)
{
- if(self->iso_layer->tcp_layer)
+ if (self->iso_layer->tcp_layer != 0)
{
- if(self->iso_layer->tcp_layer->trans)
+ if (self->iso_layer->tcp_layer->trans != 0)
{
g_tcp_close(self->iso_layer->tcp_layer->trans->sck);
self->iso_layer->tcp_layer->trans->sck = 0 ;
g_writeln("xrdp_mcs_disconnect - socket closed");
- return ;
+ return;
}
}
g_writeln("Failed to close socket");
diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c
index 1bf0c8f7..b357e954 100644
--- a/libxrdp/xrdp_rdp.c
+++ b/libxrdp/xrdp_rdp.c
@@ -487,228 +487,6 @@ xrdp_rdp_send_data_update_sync(struct xrdp_rdp *self)
}
/*****************************************************************************/
-/* http://msdn.microsoft.com/en-us/library/cc240510.aspx
- 2.2.1.3.2 Client Core Data (TS_UD_CS_CORE) */
-static int APP_CC
-xrdp_rdp_parse_client_mcs_data_CS_CORE(struct xrdp_rdp* self, struct stream* s)
-{
- int colorDepth;
- int postBeta2ColorDepth;
- int highColorDepth;
- int supportedColorDepths;
- int earlyCapabilityFlags;
-
- in_uint8s(s, 4); /* version */
- in_uint16_le(s, self->client_info.width);
- in_uint16_le(s, self->client_info.height);
- in_uint16_le(s, colorDepth);
- g_writeln("colorDepth 0x%4.4x (0xca00 4bpp 0xca01 8bpp)", colorDepth);
- switch (colorDepth)
- {
- case 0xca00: /* RNS_UD_COLOR_4BPP */
- self->client_info.bpp = 4;
- break;
- case 0xca01: /* RNS_UD_COLOR_8BPP */
- self->client_info.bpp = 8;
- break;
- }
- in_uint8s(s, 2); /* SASSequence */
- in_uint8s(s, 4); /* keyboardLayout */
- in_uint8s(s, 4); /* clientBuild */
- in_uint8s(s, 32); /* clientName */
- in_uint8s(s, 4); /* keyboardType */
- in_uint8s(s, 4); /* keyboardSubType */
- in_uint8s(s, 4); /* keyboardFunctionKey */
- in_uint8s(s, 64); /* imeFileName */
- in_uint16_le(s, postBeta2ColorDepth);
- g_writeln("postBeta2ColorDepth 0x%4.4x (0xca00 4bpp 0xca01 8bpp "
- "0xca02 15bpp 0xca03 16bpp 0xca04 24bpp)", postBeta2ColorDepth);
-
- switch (postBeta2ColorDepth)
- {
- case 0xca00: /* RNS_UD_COLOR_4BPP */
- self->client_info.bpp = 4;
- break;
- case 0xca01: /* RNS_UD_COLOR_8BPP */
- self->client_info.bpp = 8;
- break;
- case 0xca02: /* RNS_UD_COLOR_16BPP_555 */
- self->client_info.bpp = 15;
- break;
- case 0xca03: /* RNS_UD_COLOR_16BPP_565 */
- self->client_info.bpp = 16;
- break;
- case 0xca04: /* RNS_UD_COLOR_24BPP */
- self->client_info.bpp = 24;
- break;
- }
- if (!s_check_rem(s, 2))
- {
- return 0;
- }
- in_uint8s(s, 2); /* clientProductId */
-
- if (!s_check_rem(s, 4))
- {
- return 0;
- }
- in_uint8s(s, 4); /* serialNumber */
-
- if (!s_check_rem(s, 2))
- {
- return 0;
- }
- in_uint16_le(s, highColorDepth);
- g_writeln("highColorDepth 0x%4.4x (0x0004 4bpp 0x0008 8bpp 0x000f 15bpp "
- "0x0010 16 bpp 0x0018 24bpp)", highColorDepth);
- self->client_info.bpp = highColorDepth;
-
- if (!s_check_rem(s, 2))
- {
- return 0;
- }
- in_uint16_le(s, supportedColorDepths);
- g_writeln("supportedColorDepths 0x%4.4x (0x0001 24bpp 0x0002 16bpp "
- "0x0004 15bpp 0x0008 32bpp)", supportedColorDepths);
-
- if (!s_check_rem(s, 2))
- {
- return 0;
- }
- in_uint16_le(s, earlyCapabilityFlags);
- self->client_info.mcs_early_capability_flags = earlyCapabilityFlags;
- g_writeln("earlyCapabilityFlags 0x%4.4x (0x0002 want32)",
- earlyCapabilityFlags);
- if ((earlyCapabilityFlags & 0x0002) && (supportedColorDepths & 0x0008))
- {
- self->client_info.bpp = 32;
- }
-
- if (!s_check_rem(s, 64))
- {
- return 0;
- }
- in_uint8s(s, 64); /* clientDigProductId */
-
- if (!s_check_rem(s, 1))
- {
- return 0;
- }
- in_uint8(s, self->client_info.mcs_connection_type); /* connectionType */
- g_writeln("got client client connection type 0x%8.8x",
- self->client_info.mcs_connection_type);
-
- if (!s_check_rem(s, 1))
- {
- return 0;
- }
- in_uint8s(s, 1); /* pad1octet */
-
- if (!s_check_rem(s, 4))
- {
- return 0;
- }
- in_uint8s(s, 4); /* serverSelectedProtocol */
-
- if (!s_check_rem(s, 4))
- {
- return 0;
- }
- in_uint8s(s, 4); /* desktopPhysicalWidth */
-
- if (!s_check_rem(s, 4))
- {
- return 0;
- }
- in_uint8s(s, 4); /* desktopPhysicalHeight */
-
- if (!s_check_rem(s, 2))
- {
- return 0;
- }
- in_uint8s(s, 2); /* reserved */
-
- return 0;
-}
-
-/*****************************************************************************/
-/* TODO: move xrdp_sec.c::xrdp_sec_in_mcs_data here */
-static int APP_CC
-xrdp_rdp_parse_client_mcs_data(struct xrdp_rdp* self)
-{
- struct stream* s;
- int i;
- int header_type;
- int length;
- char* hold_p;
- char* hold_end;
-
- s = &(self->sec_layer->client_mcs_data);
- s->p = s->data;
-
- in_uint8s(s, 23);
- while (s->p < s->end)
- {
- if (!s_check_rem(s, 4))
- {
- g_writeln("xrdp_rdp_parse_client_mcs_data: parse error, bytes "
- "left %d", (int)(s->end - s->p));
- return 1;
- }
- hold_p = s->p;
- hold_end = s->end;
- in_uint16_le(s, header_type);
- in_uint16_le(s, length);
- g_writeln("type 0x%2.2x len %d", header_type, length);
- if (length < 4)
- {
- g_writeln("xrdp_rdp_parse_client_mcs_data: parse error");
- return 1;
- }
- if (!s_check_rem(s, length - 4))
- {
- g_writeln("xrdp_rdp_parse_client_mcs_data: parse error");
- return 1;
- }
- s->end = s->p + length;
- switch (header_type)
- {
- case 0xc001: /* CS_CORE */
- xrdp_rdp_parse_client_mcs_data_CS_CORE(self, s);
- break;
- case 0xc002: /* CS_SECURITY */
- break;
- case 0xc003: /* CS_NET */
- break;
- case 0xc004: /* CS_CLUSTER */
- break;
- default:
- g_writeln("xrdp_rdp_parse_client_mcs_data: error unknown "
- "header type 0x%4.4x", header_type);
- break;
- }
- s->p = hold_p + length;
- s->end = hold_end;
- }
- if (self->client_info.max_bpp > 0)
- {
- if (self->client_info.bpp > self->client_info.max_bpp)
- {
- g_writeln("xrdp_rdp_parse_client_mcs_data: client asked for %dbpp "
- "connection but configuration is limited to %dbpp",
- self->client_info.bpp, self->client_info.max_bpp);
- self->client_info.bpp = self->client_info.max_bpp;
- }
- }
- s->p = s->data;
-
- g_writeln("xrdp_rdp_parse_client_mcs_data: client bpp %d",
- self->client_info.bpp);
-
- return 0;
-}
-
-/*****************************************************************************/
int APP_CC
xrdp_rdp_incoming(struct xrdp_rdp *self)
{
@@ -718,19 +496,15 @@ xrdp_rdp_incoming(struct xrdp_rdp *self)
{
return 1;
}
-
self->mcs_channel = self->sec_layer->mcs_layer->userid +
MCS_USERCHANNEL_BASE;
- xrdp_rdp_parse_client_mcs_data(self);
DEBUG(("out xrdp_rdp_incoming mcs channel %d", self->mcs_channel));
-
g_strncpy(self->client_info.client_addr,
self->sec_layer->mcs_layer->iso_layer->tcp_layer->trans->addr,
sizeof(self->client_info.client_addr) - 1);
g_strncpy(self->client_info.client_port,
self->sec_layer->mcs_layer->iso_layer->tcp_layer->trans->port,
sizeof(self->client_info.client_port) - 1);
-
return 0;
}
diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c
index 71cb513f..693407a5 100644
--- a/libxrdp/xrdp_sec.c
+++ b/libxrdp/xrdp_sec.c
@@ -21,6 +21,12 @@
#include "libxrdp.h"
#include "log.h"
+#define LOG_LEVEL 1
+#define LLOG(_level, _args) \
+ do { if (_level < LOG_LEVEL) { g_write _args ; } } while (0)
+#define LLOGLN(_level, _args) \
+ do { if (_level < LOG_LEVEL) { g_writeln _args ; } } while (0)
+
/* some compilers need unsigned char to avoid warnings */
static tui8 g_pad_54[40] =
{
@@ -100,6 +106,83 @@ static tui8 g_lic3[20] =
0xf3, 0x99, 0x00, 0x00
};
+static const tui8 g_fips_reverse_table[256] =
+{
+ 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
+ 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
+ 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
+ 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
+ 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
+ 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
+ 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
+ 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
+ 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
+ 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
+ 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
+ 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
+ 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
+ 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
+ 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
+ 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
+ 0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
+ 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
+ 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
+ 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
+ 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
+ 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
+ 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
+ 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
+ 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
+ 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
+ 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
+ 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
+ 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
+ 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
+ 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
+ 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
+};
+
+static const tui8 g_fips_oddparity_table[256] =
+{
+ 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x07, 0x07,
+ 0x08, 0x08, 0x0b, 0x0b, 0x0d, 0x0d, 0x0e, 0x0e,
+ 0x10, 0x10, 0x13, 0x13, 0x15, 0x15, 0x16, 0x16,
+ 0x19, 0x19, 0x1a, 0x1a, 0x1c, 0x1c, 0x1f, 0x1f,
+ 0x20, 0x20, 0x23, 0x23, 0x25, 0x25, 0x26, 0x26,
+ 0x29, 0x29, 0x2a, 0x2a, 0x2c, 0x2c, 0x2f, 0x2f,
+ 0x31, 0x31, 0x32, 0x32, 0x34, 0x34, 0x37, 0x37,
+ 0x38, 0x38, 0x3b, 0x3b, 0x3d, 0x3d, 0x3e, 0x3e,
+ 0x40, 0x40, 0x43, 0x43, 0x45, 0x45, 0x46, 0x46,
+ 0x49, 0x49, 0x4a, 0x4a, 0x4c, 0x4c, 0x4f, 0x4f,
+ 0x51, 0x51, 0x52, 0x52, 0x54, 0x54, 0x57, 0x57,
+ 0x58, 0x58, 0x5b, 0x5b, 0x5d, 0x5d, 0x5e, 0x5e,
+ 0x61, 0x61, 0x62, 0x62, 0x64, 0x64, 0x67, 0x67,
+ 0x68, 0x68, 0x6b, 0x6b, 0x6d, 0x6d, 0x6e, 0x6e,
+ 0x70, 0x70, 0x73, 0x73, 0x75, 0x75, 0x76, 0x76,
+ 0x79, 0x79, 0x7a, 0x7a, 0x7c, 0x7c, 0x7f, 0x7f,
+ 0x80, 0x80, 0x83, 0x83, 0x85, 0x85, 0x86, 0x86,
+ 0x89, 0x89, 0x8a, 0x8a, 0x8c, 0x8c, 0x8f, 0x8f,
+ 0x91, 0x91, 0x92, 0x92, 0x94, 0x94, 0x97, 0x97,
+ 0x98, 0x98, 0x9b, 0x9b, 0x9d, 0x9d, 0x9e, 0x9e,
+ 0xa1, 0xa1, 0xa2, 0xa2, 0xa4, 0xa4, 0xa7, 0xa7,
+ 0xa8, 0xa8, 0xab, 0xab, 0xad, 0xad, 0xae, 0xae,
+ 0xb0, 0xb0, 0xb3, 0xb3, 0xb5, 0xb5, 0xb6, 0xb6,
+ 0xb9, 0xb9, 0xba, 0xba, 0xbc, 0xbc, 0xbf, 0xbf,
+ 0xc1, 0xc1, 0xc2, 0xc2, 0xc4, 0xc4, 0xc7, 0xc7,
+ 0xc8, 0xc8, 0xcb, 0xcb, 0xcd, 0xcd, 0xce, 0xce,
+ 0xd0, 0xd0, 0xd3, 0xd3, 0xd5, 0xd5, 0xd6, 0xd6,
+ 0xd9, 0xd9, 0xda, 0xda, 0xdc, 0xdc, 0xdf, 0xdf,
+ 0xe0, 0xe0, 0xe3, 0xe3, 0xe5, 0xe5, 0xe6, 0xe6,
+ 0xe9, 0xe9, 0xea, 0xea, 0xec, 0xec, 0xef, 0xef,
+ 0xf1, 0xf1, 0xf2, 0xf2, 0xf4, 0xf4, 0xf7, 0xf7,
+ 0xf8, 0xf8, 0xfb, 0xfb, 0xfd, 0xfd, 0xfe, 0xfe
+};
+
+static const tui8 g_fips_ivec[8] =
+{
+ 0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF
+};
+
/*****************************************************************************/
static void APP_CC
hex_str_to_bin(char *in, char *out, int out_len)
@@ -145,8 +228,8 @@ xrdp_sec_create(struct xrdp_rdp *owner, struct trans *trans, int crypt_level,
DEBUG((" in xrdp_sec_create"));
self = (struct xrdp_sec *)g_malloc(sizeof(struct xrdp_sec), 1);
self->rdp_layer = owner;
- self->crypt_method = CRYPT_METHOD_40BIT;
- self->crypt_level = CRYPT_LEVEL_LOW;
+ self->crypt_method = CRYPT_METHOD_NONE;
+ self->crypt_level = CRYPT_LEVEL_NONE;
switch (crypt_level)
{
case 1: /* low */
@@ -207,6 +290,8 @@ xrdp_sec_delete(struct xrdp_sec *self)
xrdp_mcs_delete(self->mcs_layer);
ssl_rc4_info_delete(self->decrypt_rc4_info); /* TODO clear all data */
ssl_rc4_info_delete(self->encrypt_rc4_info); /* TODO clear all data */
+ ssl_des3_info_delete(self->decrypt_fips_info);
+ ssl_des3_info_delete(self->encrypt_fips_info);
g_free(self->client_mcs_data.data);
g_free(self->server_mcs_data.data);
/* Crypto information must always be cleared */
@@ -224,7 +309,11 @@ xrdp_sec_init(struct xrdp_sec *self, struct stream *s)
return 1;
}
- if (self->crypt_level > 1)
+ if (self->crypt_level == CRYPT_LEVEL_FIPS)
+ {
+ s_push_layer(s, sec_hdr, 4 + 4 + 8);
+ }
+ else if (self->crypt_level > CRYPT_LEVEL_LOW)
{
s_push_layer(s, sec_hdr, 4 + 8);
}
@@ -288,34 +377,48 @@ xrdp_sec_update(char *key, char *update_key, int key_len)
static void APP_CC
xrdp_sec_decrypt(struct xrdp_sec *self, char *data, int len)
{
- if (self->decrypt_use_count == 4096)
+ if (self->crypt_method == CRYPT_METHOD_FIPS)
{
- xrdp_sec_update(self->decrypt_key, self->decrypt_update_key,
- self->rc4_key_len);
- ssl_rc4_set_key(self->decrypt_rc4_info, self->decrypt_key,
- self->rc4_key_len);
- self->decrypt_use_count = 0;
+ ssl_des3_decrypt(self->decrypt_fips_info, len, data, data);
}
+ else
+ {
+ if (self->decrypt_use_count == 4096)
+ {
+ xrdp_sec_update(self->decrypt_key, self->decrypt_update_key,
+ self->rc4_key_len);
+ ssl_rc4_set_key(self->decrypt_rc4_info, self->decrypt_key,
+ self->rc4_key_len);
+ self->decrypt_use_count = 0;
+ }
- ssl_rc4_crypt(self->decrypt_rc4_info, data, len);
- self->decrypt_use_count++;
+ ssl_rc4_crypt(self->decrypt_rc4_info, data, len);
+ self->decrypt_use_count++;
+ }
}
/*****************************************************************************/
static void APP_CC
xrdp_sec_encrypt(struct xrdp_sec *self, char *data, int len)
{
- if (self->encrypt_use_count == 4096)
+ if (self->crypt_method == CRYPT_METHOD_FIPS)
{
- xrdp_sec_update(self->encrypt_key, self->encrypt_update_key,
- self->rc4_key_len);
- ssl_rc4_set_key(self->encrypt_rc4_info, self->encrypt_key,
- self->rc4_key_len);
- self->encrypt_use_count = 0;
+ ssl_des3_encrypt(self->encrypt_fips_info, len, data, data);
}
+ else
+ {
+ if (self->encrypt_use_count == 4096)
+ {
+ xrdp_sec_update(self->encrypt_key, self->encrypt_update_key,
+ self->rc4_key_len);
+ ssl_rc4_set_key(self->encrypt_rc4_info, self->encrypt_key,
+ self->rc4_key_len);
+ self->encrypt_use_count = 0;
+ }
- ssl_rc4_crypt(self->encrypt_rc4_info, data, len);
- self->encrypt_use_count++;
+ ssl_rc4_crypt(self->encrypt_rc4_info, data, len);
+ self->encrypt_use_count++;
+ }
}
/*****************************************************************************/
@@ -700,11 +803,95 @@ xrdp_sec_hash_16(char *out, char *in, char *salt1, char *salt2)
/*****************************************************************************/
static void APP_CC
+fips_expand_key_bits(const char *in, char *out)
+{
+ tui8 buf[32];
+ tui8 c;
+ int i;
+ int b;
+ int p;
+ int r;
+
+ /* reverse every byte in the key */
+ for (i = 0; i < 21; i++)
+ {
+ c = in[i];
+ buf[i] = g_fips_reverse_table[c];
+ }
+ /* insert a zero-bit after every 7th bit */
+ for (i = 0, b = 0; i < 24; i++, b += 7)
+ {
+ p = b / 8;
+ r = b % 8;
+ if (r == 0)
+ {
+ out[i] = buf[p] & 0xfe;
+ }
+ else
+ {
+ /* c is accumulator */
+ c = buf[p] << r;
+ c |= buf[p + 1] >> (8 - r);
+ out[i] = c & 0xfe;
+ }
+ }
+ /* reverse every byte */
+ /* alter lsb so the byte has odd parity */
+ for (i = 0; i < 24; i++)
+ {
+ c = out[i];
+ c = g_fips_reverse_table[c];
+ out[i] = g_fips_oddparity_table[c];
+ }
+}
+
+/*****************************************************************************/
+static void APP_CC
xrdp_sec_establish_keys(struct xrdp_sec *self)
{
char session_key[48];
char temp_hash[48];
char input[48];
+ char client_encrypt_key[32];
+ char client_decrypt_key[32];
+ const char *fips_ivec;
+ void *sha1;
+
+ if (self->crypt_method == CRYPT_METHOD_FIPS)
+ {
+ LLOGLN(0, ("xrdp_sec_establish_keys: fips"));
+ sha1 = ssl_sha1_info_create();
+ ssl_sha1_transform(sha1, self->client_random + 16, 16);
+ ssl_sha1_transform(sha1, self->server_random + 16, 16);
+ ssl_sha1_complete(sha1, client_encrypt_key);
+ client_encrypt_key[20] = client_encrypt_key[0];
+ fips_expand_key_bits(client_encrypt_key, self->fips_encrypt_key);
+ ssl_sha1_info_delete(sha1);
+
+ sha1 = ssl_sha1_info_create();
+ ssl_sha1_transform(sha1, self->client_random, 16);
+ ssl_sha1_transform(sha1, self->server_random, 16);
+ ssl_sha1_complete(sha1, client_decrypt_key);
+ client_decrypt_key[20] = client_decrypt_key[0];
+ fips_expand_key_bits(client_decrypt_key, self->fips_decrypt_key);
+ ssl_sha1_info_delete(sha1);
+
+ sha1 = ssl_sha1_info_create();
+ ssl_sha1_transform(sha1, client_decrypt_key, 20);
+ ssl_sha1_transform(sha1, client_encrypt_key, 20);
+ ssl_sha1_complete(sha1, self->fips_sign_key);
+ ssl_sha1_info_delete(sha1);
+
+ fips_ivec = (const char *) g_fips_ivec;
+ self->encrypt_fips_info =
+ ssl_des3_encrypt_info_create(self->fips_encrypt_key, fips_ivec);
+ self->decrypt_fips_info =
+ ssl_des3_encrypt_info_create(self->fips_decrypt_key, fips_ivec);
+ }
+ else
+ {
+ LLOGLN(0, ("xrdp_sec_establish_keys: not fips"));
+ }
g_memcpy(input, self->client_random, 24);
g_memcpy(input + 24, self->server_random, 24);
@@ -761,12 +948,24 @@ xrdp_sec_recv(struct xrdp_sec *self, struct stream *s, int *chan)
if (flags & SEC_ENCRYPT) /* 0x08 */
{
- if (!s_check_rem(s, 8))
+ if (self->crypt_method == CRYPT_METHOD_FIPS)
{
- return 1;
+ if (!s_check_rem(s, 12))
+ {
+ return 1;
+ }
+ in_uint8s(s, 12); /* len(2), version(1), pad(1), signature(8) */
+ xrdp_sec_decrypt(self, s->p, (int)(s->end - s->p));
+ }
+ else
+ {
+ if (!s_check_rem(s, 8))
+ {
+ return 1;
+ }
+ in_uint8s(s, 8); /* signature(8) */
+ xrdp_sec_decrypt(self, s->p, (int)(s->end - s->p));
}
- in_uint8s(s, 8); /* signature */
- xrdp_sec_decrypt(self, s->p, (int)(s->end - s->p));
}
if (flags & SEC_CLIENT_RANDOM) /* 0x01 */
@@ -884,7 +1083,10 @@ xrdp_sec_send(struct xrdp_sec *self, struct stream *s, int chan)
DEBUG((" in xrdp_sec_send"));
s_pop_layer(s, sec_hdr);
- if (self->crypt_level > 1)
+ if (self->crypt_level == CRYPT_LEVEL_FIPS)
+ {
+ }
+ else if (self->crypt_level > CRYPT_LEVEL_LOW)
{
out_uint32_le(s, SEC_ENCRYPT);
datalen = (int)((s->end - s->p) - 8);
@@ -906,6 +1108,235 @@ xrdp_sec_send(struct xrdp_sec *self, struct stream *s, int chan)
}
/*****************************************************************************/
+/* http://msdn.microsoft.com/en-us/library/cc240510.aspx
+ 2.2.1.3.2 Client Core Data (TS_UD_CS_CORE) */
+static int APP_CC
+xrdp_sec_process_mcs_data_CS_CORE(struct xrdp_sec* self, struct stream* s)
+{
+ int colorDepth;
+ int postBeta2ColorDepth;
+ int highColorDepth;
+ int supportedColorDepths;
+ int earlyCapabilityFlags;
+
+ in_uint8s(s, 4); /* version */
+ in_uint16_le(s, self->rdp_layer->client_info.width);
+ in_uint16_le(s, self->rdp_layer->client_info.height);
+ in_uint16_le(s, colorDepth);
+ g_writeln("colorDepth 0x%4.4x (0xca00 4bpp 0xca01 8bpp)", colorDepth);
+ switch (colorDepth)
+ {
+ case 0xca00: /* RNS_UD_COLOR_4BPP */
+ self->rdp_layer->client_info.bpp = 4;
+ break;
+ case 0xca01: /* RNS_UD_COLOR_8BPP */
+ self->rdp_layer->client_info.bpp = 8;
+ break;
+ }
+ in_uint8s(s, 2); /* SASSequence */
+ in_uint8s(s, 4); /* keyboardLayout */
+ in_uint8s(s, 4); /* clientBuild */
+ in_uint8s(s, 32); /* clientName */
+ in_uint8s(s, 4); /* keyboardType */
+ in_uint8s(s, 4); /* keyboardSubType */
+ in_uint8s(s, 4); /* keyboardFunctionKey */
+ in_uint8s(s, 64); /* imeFileName */
+ in_uint16_le(s, postBeta2ColorDepth);
+ g_writeln("postBeta2ColorDepth 0x%4.4x (0xca00 4bpp 0xca01 8bpp "
+ "0xca02 15bpp 0xca03 16bpp 0xca04 24bpp)", postBeta2ColorDepth);
+
+ switch (postBeta2ColorDepth)
+ {
+ case 0xca00: /* RNS_UD_COLOR_4BPP */
+ self->rdp_layer->client_info.bpp = 4;
+ break;
+ case 0xca01: /* RNS_UD_COLOR_8BPP */
+ self->rdp_layer->client_info.bpp = 8;
+ break;
+ case 0xca02: /* RNS_UD_COLOR_16BPP_555 */
+ self->rdp_layer->client_info.bpp = 15;
+ break;
+ case 0xca03: /* RNS_UD_COLOR_16BPP_565 */
+ self->rdp_layer->client_info.bpp = 16;
+ break;
+ case 0xca04: /* RNS_UD_COLOR_24BPP */
+ self->rdp_layer->client_info.bpp = 24;
+ break;
+ }
+ if (!s_check_rem(s, 2))
+ {
+ return 0;
+ }
+ in_uint8s(s, 2); /* clientProductId */
+
+ if (!s_check_rem(s, 4))
+ {
+ return 0;
+ }
+ in_uint8s(s, 4); /* serialNumber */
+
+ if (!s_check_rem(s, 2))
+ {
+ return 0;
+ }
+ in_uint16_le(s, highColorDepth);
+ g_writeln("highColorDepth 0x%4.4x (0x0004 4bpp 0x0008 8bpp 0x000f 15bpp "
+ "0x0010 16 bpp 0x0018 24bpp)", highColorDepth);
+ self->rdp_layer->client_info.bpp = highColorDepth;
+
+ if (!s_check_rem(s, 2))
+ {
+ return 0;
+ }
+ in_uint16_le(s, supportedColorDepths);
+ g_writeln("supportedColorDepths 0x%4.4x (0x0001 24bpp 0x0002 16bpp "
+ "0x0004 15bpp 0x0008 32bpp)", supportedColorDepths);
+
+ if (!s_check_rem(s, 2))
+ {
+ return 0;
+ }
+ in_uint16_le(s, earlyCapabilityFlags);
+ self->rdp_layer->client_info.mcs_early_capability_flags = earlyCapabilityFlags;
+ g_writeln("earlyCapabilityFlags 0x%4.4x (0x0002 want32)",
+ earlyCapabilityFlags);
+ if ((earlyCapabilityFlags & 0x0002) && (supportedColorDepths & 0x0008))
+ {
+ self->rdp_layer->client_info.bpp = 32;
+ }
+
+ if (!s_check_rem(s, 64))
+ {
+ return 0;
+ }
+ in_uint8s(s, 64); /* clientDigProductId */
+
+ if (!s_check_rem(s, 1))
+ {
+ return 0;
+ }
+ in_uint8(s, self->rdp_layer->client_info.mcs_connection_type); /* connectionType */
+ g_writeln("got client client connection type 0x%8.8x",
+ self->rdp_layer->client_info.mcs_connection_type);
+
+ if (!s_check_rem(s, 1))
+ {
+ return 0;
+ }
+ in_uint8s(s, 1); /* pad1octet */
+
+ if (!s_check_rem(s, 4))
+ {
+ return 0;
+ }
+ in_uint8s(s, 4); /* serverSelectedProtocol */
+
+ if (!s_check_rem(s, 4))
+ {
+ return 0;
+ }
+ in_uint8s(s, 4); /* desktopPhysicalWidth */
+
+ if (!s_check_rem(s, 4))
+ {
+ return 0;
+ }
+ in_uint8s(s, 4); /* desktopPhysicalHeight */
+
+ if (!s_check_rem(s, 2))
+ {
+ return 0;
+ }
+ in_uint8s(s, 2); /* reserved */
+
+ return 0;
+}
+
+/*****************************************************************************/
+static int APP_CC
+xrdp_sec_process_mcs_data_CS_SECURITY(struct xrdp_sec *self, struct stream* s)
+{
+ int crypt_method;
+ int found;
+
+ g_writeln("xrdp_sec_process_mcs_data_CS_SECURITY:");
+ in_uint32_le(s, crypt_method);
+ if (crypt_method & CRYPT_METHOD_40BIT)
+ {
+ g_writeln(" client supports 40 bit encryption");
+ }
+ if (crypt_method & CRYPT_METHOD_128BIT)
+ {
+ g_writeln(" client supports 128 bit encryption");
+ }
+ if (crypt_method & CRYPT_METHOD_56BIT)
+ {
+ g_writeln(" client supports 56 bit encryption");
+ }
+ if (crypt_method & CRYPT_METHOD_FIPS)
+ {
+ g_writeln(" client supports fips encryption");
+ }
+ found = 0;
+ if ((found == 0) &&
+ (self->crypt_method & CRYPT_METHOD_FIPS) &&
+ (self->crypt_level == CRYPT_LEVEL_FIPS))
+ {
+ if (crypt_method & CRYPT_METHOD_FIPS)
+ {
+ g_writeln(" client and server support fips, using fips");
+ self->crypt_method = CRYPT_METHOD_FIPS;
+ self->crypt_level = CRYPT_LEVEL_FIPS;
+ found = 1;
+ }
+ }
+ if ((found == 0) &&
+ (self->crypt_method & CRYPT_METHOD_128BIT) &&
+ (self->crypt_level == CRYPT_LEVEL_HIGH))
+ {
+ if (crypt_method & CRYPT_METHOD_128BIT)
+ {
+ g_writeln(" client and server support high crypt, using "
+ "high crypt");
+ self->crypt_method = CRYPT_METHOD_128BIT;
+ self->crypt_level = CRYPT_LEVEL_HIGH;
+ found = 1;
+ }
+ }
+ if ((found == 0) &&
+ (self->crypt_method & CRYPT_METHOD_40BIT) &&
+ (self->crypt_level == CRYPT_LEVEL_CLIENT_COMPATIBLE))
+ {
+ if (crypt_method & CRYPT_METHOD_40BIT)
+ {
+ g_writeln(" client and server support medium crypt, using "
+ "medium crypt");
+ self->crypt_method = CRYPT_METHOD_40BIT;
+ self->crypt_level = CRYPT_LEVEL_CLIENT_COMPATIBLE;
+ found = 1;
+ }
+ }
+ if ((found == 0) &&
+ (self->crypt_method & CRYPT_METHOD_40BIT) &&
+ (self->crypt_level == CRYPT_LEVEL_LOW))
+ {
+ if (crypt_method & CRYPT_METHOD_40BIT)
+ {
+ g_writeln(" client and server support low crypt, using "
+ "low crypt");
+ self->crypt_method = CRYPT_METHOD_40BIT;
+ self->crypt_level = CRYPT_LEVEL_LOW;
+ found = 1;
+ }
+ }
+ if (found == 0)
+ {
+ g_writeln(" no security");
+ }
+ return 0;
+}
+
+/*****************************************************************************/
/* this adds the mcs channels in the list of channels to be used when
creating the server mcs data */
static int APP_CC
@@ -954,6 +1385,7 @@ xrdp_sec_process_mcs_data_channels(struct xrdp_sec *self, struct stream *s)
return 0;
}
+
/*****************************************************************************/
/* reads the client monitors data */
static int APP_CC
@@ -1009,6 +1441,7 @@ xrdp_sec_process_mcs_data_monitors(struct xrdp_sec *self, struct stream *s)
}
return 0;
}
+
/*****************************************************************************/
/* process client mcs data, we need some things in here to create the server
mcs data */
@@ -1038,39 +1471,70 @@ xrdp_sec_process_mcs_data(struct xrdp_sec *self)
if (size < 4 || !s_check_rem(s, size - 4))
{
- g_writeln("error in xrdp_sec_process_mcs_data tag %d size %d",
- tag, size);
+ LLOGLN(0, ("error in xrdp_sec_process_mcs_data tag %d size %d",
+ tag, size));
break;
}
+ LLOGLN(10, ("xrdp_sec_process_mcs_data: 0x%8.8x", tag));
switch (tag)
{
- case SEC_TAG_CLI_INFO:
+ case SEC_TAG_CLI_INFO: /* CS_CORE 0xC001 */
+ if (xrdp_sec_process_mcs_data_CS_CORE(self, s) != 0)
+ {
+ return 1;
+ }
break;
- case SEC_TAG_CLI_CRYPT:
+ case SEC_TAG_CLI_CRYPT: /* CS_SECURITY 0xC002 */
+ if (xrdp_sec_process_mcs_data_CS_SECURITY(self, s) != 0)
+ {
+ return 1;
+ }
break;
- case SEC_TAG_CLI_CHANNELS:
+ case SEC_TAG_CLI_CHANNELS: /* CS_NET 0xC003 */
if (xrdp_sec_process_mcs_data_channels(self, s) != 0)
{
return 1;
}
break;
- case SEC_TAG_CLI_4:
+ case SEC_TAG_CLI_4: /* CS_CLUSTER 0xC004 */
break;
- case SEC_TAG_CLI_MONITOR:
+ case SEC_TAG_CLI_MONITOR: /* CS_MONITOR 0xC005 */
if (xrdp_sec_process_mcs_data_monitors(self, s) != 0)
{
return 1;
}
break;
+ /* CS_MCS_MSGCHANNEL 0xC006
+ CS_MONITOR_EX 0xC008
+ CS_MULTITRANSPORT 0xC00A
+ SC_CORE 0x0C01
+ SC_SECURITY 0x0C02
+ SC_NET 0x0C03
+ SC_MCS_MSGCHANNEL 0x0C04
+ SC_MULTITRANSPORT 0x0C08 */
default:
- g_writeln("error unknown xrdp_sec_process_mcs_data tag %d size %d",
- tag, size);
+ LLOGLN(0, ("error unknown xrdp_sec_process_mcs_data tag %d "
+ "size %d", tag, size));
break;
}
s->p = hold_p + size;
}
+
+ if (self->rdp_layer->client_info.max_bpp > 0)
+ {
+ if (self->rdp_layer->client_info.bpp >
+ self->rdp_layer->client_info.max_bpp)
+ {
+ LLOGLN(0, ("xrdp_rdp_parse_client_mcs_data: client asked "
+ "for %dbpp connection but configuration is limited "
+ "to %dbpp", self->rdp_layer->client_info.bpp,
+ self->rdp_layer->client_info.max_bpp));
+ self->rdp_layer->client_info.bpp =
+ self->rdp_layer->client_info.max_bpp;
+ }
+ }
/* set p to beginning */
s->p = s->data;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-19 21:38:17 +0000