Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 18:23:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSTSC]

Browse source 
* Partial sync with rdesktop-ce to fix Windows 2008 R2 server login.
CORE-8561 #resolve #comment Should be fixed in r64362. Please retest.

svn path=/trunk/; revision=64362
This commit is contained in:
Amine Khaldi 2014-09-28 11:18:16 +00:00
parent feff0aa317
commit e4ad48c2b9
2 changed files with 56 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

15
reactos/base/applications/mstsc/constants.h
View file

@ -13,9 +13,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License
with this program; if not, write to the Free Software Foundation, Inc., along with this program; if not, write to the Free Software
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* TCP port for Remote Desktop Protocol */ /* TCP port for Remote Desktop Protocol */
@ -60,10 +60,11 @@ enum MCS_PDU_TYPE
#define MCS_USERCHANNEL_BASE 1001 #define MCS_USERCHANNEL_BASE 1001
/* RDP secure transport constants */ /* RDP secure transport constants */
#define SEC_RANDOM_SIZE 32 #define SEC_RANDOM_SIZE 32
#define SEC_MODULUS_SIZE 64 #define SEC_MODULUS_SIZE 64
#define SEC_PADDING_SIZE 8 #define SEC_MAX_MODULUS_SIZE 256
#define SEC_EXPONENT_SIZE 4 #define SEC_PADDING_SIZE 8
#define SEC_EXPONENT_SIZE 4
#define SEC_CLIENT_RANDOM 0x0001 #define SEC_CLIENT_RANDOM 0x0001
#define SEC_ENCRYPT 0x0008 #define SEC_ENCRYPT 0x0008

74
reactos/base/applications/mstsc/secure.c
View file

@ -13,9 +13,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License
with this program; if not, write to the Free Software Foundation, Inc., along with this program; if not, write to the Free Software
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include "precomp.h" #include "precomp.h"
@ -56,7 +56,7 @@ int
ssl_mod_exp(char* out, int out_len, char* in, int in_len, ssl_mod_exp(char* out, int out_len, char* in, int in_len,
char* mod, int mod_len, char* exp, int exp_len); char* mod, int mod_len, char* exp, int exp_len);
extern char g_hostname[]; extern char g_hostname[16];
extern int g_width; extern int g_width;
extern int g_height; extern int g_height;
extern unsigned int g_keylayout; extern unsigned int g_keylayout;
@ -77,13 +77,14 @@ static void * rc4_decrypt_key = 0;
static void * rc4_encrypt_key = 0; static void * rc4_encrypt_key = 0;
//static RSA *server_public_key; //static RSA *server_public_key;
static void * server_public_key; static void * server_public_key;
static uint32 server_public_key_len;
static uint8 sec_sign_key[16]; static uint8 sec_sign_key[16];
static uint8 sec_decrypt_key[16]; static uint8 sec_decrypt_key[16];
static uint8 sec_encrypt_key[16]; static uint8 sec_encrypt_key[16];
static uint8 sec_decrypt_update_key[16]; static uint8 sec_decrypt_update_key[16];
static uint8 sec_encrypt_update_key[16]; static uint8 sec_encrypt_update_key[16];
static uint8 sec_crypted_random[SEC_MODULUS_SIZE]; static uint8 sec_crypted_random[SEC_MAX_MODULUS_SIZE];
uint16 g_server_rdp_version = 0; uint16 g_server_rdp_version = 0;
@ -347,16 +348,32 @@ reverse(uint8 * p, int len)
/* Perform an RSA public key encryption operation */ /* Perform an RSA public key encryption operation */
static void static void
sec_rsa_encrypt(uint8 * out, uint8 * in, int len, uint8 * modulus, uint8 * exponent) //sec_rsa_encrypt(uint8 * out, uint8 * in, int len, uint8 * modulus, uint8 * exponent)
sec_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus, uint8 * exponent)
{ {
ssl_mod_exp((char *)out, 64, (char *)in, 32, (char *)modulus, 64, (char *)exponent, 4); ssl_mod_exp((char *)out, 64, (char *)in, 32, (char *)modulus, 64, (char *)exponent, 4);
/*
ssl_mod_exp(out, 64, in, 32, modulus, 64, exponent, 4);
ssl_mod_exp(char* out, int out_len, char* in, int in_len,
char* mod, int mod_len, char* exp, int exp_len)
e = (DIGIT_T*)l_exp;
x = (DIGIT_T*)l_in;
y = (DIGIT_T*)l_out;
m = (DIGIT_T*)l_mod;
*/
//BN_CTX *ctx;
/* /*
BN_CTX *ctx; BN_CTX *ctx;
BIGNUM mod, exp, x, y; BIGNUM mod, exp, x, y;
uint8 inr[SEC_MODULUS_SIZE]; uint8 inr[SEC_MAX_MODULUS_SIZE];
int outlen; int outlen;
reverse(modulus, SEC_MODULUS_SIZE); reverse(modulus, modulus_size);
reverse(exponent, SEC_EXPONENT_SIZE); reverse(exponent, SEC_EXPONENT_SIZE);
memcpy(inr, in, len); memcpy(inr, in, len);
reverse(inr, len); reverse(inr, len);
@ -367,14 +384,14 @@ sec_rsa_encrypt(uint8 * out, uint8 * in, int len, uint8 * modulus, uint8 * expon
BN_init(&x); BN_init(&x);
BN_init(&y); BN_init(&y);
BN_bin2bn(modulus, SEC_MODULUS_SIZE, &mod); BN_bin2bn(modulus, modulus_size, &mod);
BN_bin2bn(exponent, SEC_EXPONENT_SIZE, &exp); BN_bin2bn(exponent, SEC_EXPONENT_SIZE, &exp);
BN_bin2bn(inr, len, &x); BN_bin2bn(inr, len, &x);
BN_mod_exp(&y, &x, &exp, &mod, ctx); BN_mod_exp(&y, &x, &exp, &mod, ctx);
outlen = BN_bn2bin(&y, out); outlen = BN_bn2bin(&y, out);
reverse(out, outlen); reverse(out, outlen);
if (outlen < SEC_MODULUS_SIZE) if (outlen < modulus_size)
memset(out + outlen, 0, SEC_MODULUS_SIZE - outlen); memset(out + outlen, 0, modulus_size - outlen);
BN_free(&y); BN_free(&y);
BN_clear_free(&x); BN_clear_free(&x);
@ -440,14 +457,14 @@ sec_send(STREAM s, uint32 flags)
static void static void
sec_establish_key(void) sec_establish_key(void)
{ {
uint32 length = SEC_MODULUS_SIZE + SEC_PADDING_SIZE; uint32 length = server_public_key_len + SEC_PADDING_SIZE;
uint32 flags = SEC_CLIENT_RANDOM; uint32 flags = SEC_CLIENT_RANDOM;
STREAM s; STREAM s;
s = sec_init(flags, 76); s = sec_init(flags, length+4);
out_uint32_le(s, length); out_uint32_le(s, length);
out_uint8p(s, sec_crypted_random, SEC_MODULUS_SIZE); out_uint8p(s, sec_crypted_random, server_public_key_len);
out_uint8s(s, SEC_PADDING_SIZE); out_uint8s(s, SEC_PADDING_SIZE);
s_mark_end(s); s_mark_end(s);
@ -559,16 +576,18 @@ sec_parse_public_key(STREAM s, uint8 ** modulus, uint8 ** exponent)
} }
in_uint32_le(s, modulus_len); in_uint32_le(s, modulus_len);
if (modulus_len != SEC_MODULUS_SIZE + SEC_PADDING_SIZE) modulus_len -= SEC_PADDING_SIZE;
if ((modulus_len < 64) || (modulus_len > SEC_MAX_MODULUS_SIZE))
{ {
error("modulus len 0x%x\n", modulus_len); error("Bad server public key size (%u bits)\n", modulus_len*8);
return False; return False;
} }
in_uint8s(s, 8); /* modulus_bits, unknown */ in_uint8s(s, 8); /* modulus_bits, unknown */
in_uint8p(s, *exponent, SEC_EXPONENT_SIZE); in_uint8p(s, *exponent, SEC_EXPONENT_SIZE);
in_uint8p(s, *modulus, SEC_MODULUS_SIZE); in_uint8p(s, *modulus, modulus_len);
in_uint8s(s, SEC_PADDING_SIZE); in_uint8s(s, SEC_PADDING_SIZE);
server_public_key_len = modulus_len;
return s_check(s); return s_check(s);
} }
@ -740,10 +759,10 @@ sec_parse_crypt_info(STREAM s, uint32 * rc4_key_size,
static void static void
sec_process_crypt_info(STREAM s) sec_process_crypt_info(STREAM s)
{ {
uint8 *server_random, *modulus = NULL, *exponent = NULL; uint8 *server_random, *modulus, *exponent;
uint8 client_random[SEC_RANDOM_SIZE]; uint8 client_random[SEC_RANDOM_SIZE];
uint32 rc4_key_size; uint32 rc4_key_size;
uint8 inr[SEC_MODULUS_SIZE]; //uint8 inr[SEC_MODULUS_SIZE];
if (!sec_parse_crypt_info(s, &rc4_key_size, &server_random, &modulus, &exponent)) if (!sec_parse_crypt_info(s, &rc4_key_size, &server_random, &modulus, &exponent))
{ {
@ -754,15 +773,14 @@ sec_process_crypt_info(STREAM s)
DEBUG(("Generating client random\n")); DEBUG(("Generating client random\n"));
/* Generate a client random, and hence determine encryption keys */ /* Generate a client random, and hence determine encryption keys */
/* This is what the MS client do: */ /* This is what the MS client do: */
memset(inr, 0, SEC_RANDOM_SIZE); //memset(inr, 0, SEC_RANDOM_SIZE);
/* *ARIGL!* Plaintext attack, anyone? /* *ARIGL!* Plaintext attack, anyone?
I tried doing: I tried doing:
generate_random(inr); generate_random(inr);
..but that generates connection errors now and then (yes, ..but that generates connection errors now and then (yes,
"now and then". Something like 0 to 3 attempts needed before a "now and then". Something like 0 to 3 attempts needed before a
successful connection. Nice. Not! successful connection. Nice. Not!
*/ */
generate_random(client_random); generate_random(client_random);
if (NULL != server_public_key) if (NULL != server_public_key)
{ /* Which means we should use { /* Which means we should use
@ -783,7 +801,7 @@ sec_process_crypt_info(STREAM s)
else else
{ /* RDP4-style encryption */ { /* RDP4-style encryption */
sec_rsa_encrypt(sec_crypted_random, sec_rsa_encrypt(sec_crypted_random,
client_random, SEC_RANDOM_SIZE, modulus, exponent); client_random, SEC_RANDOM_SIZE, server_public_key_len, modulus, exponent);
} }
sec_generate_keys(client_random, server_random, rc4_key_size); sec_generate_keys(client_random, server_random, rc4_key_size);
} }