CVS: rdesktop secure.c,1.67,1.68
Jay Sorg <[email protected]> Fri, 09 Feb 2007 21:16:00 -0800
| Newsgroups | gmane.network.rdesktop.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9523
Modified Files:
secure.c
Log Message:
g_ prefix for global vars
Index: secure.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/secure.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** secure.c 27 Jan 2007 20:38:30 -0000 1.67
--- secure.c 10 Feb 2007 05:15:58 -0000 1.68
***************
*** 34,58 ****
extern RD_BOOL g_console_session;
extern int g_server_depth;
- extern uint16 mcs_userid;
extern VCHANNEL g_channels[];
extern unsigned int g_num_channels;
! static int rc4_key_len;
! static SSL_RC4 rc4_decrypt_key;
! static SSL_RC4 rc4_encrypt_key;
! static uint32 server_public_key_len;
! static uint8 sec_sign_key[16];
! static uint8 sec_decrypt_key[16];
! static uint8 sec_encrypt_key[16];
! static uint8 sec_decrypt_update_key[16];
! static uint8 sec_encrypt_update_key[16];
! static uint8 sec_crypted_random[SEC_MAX_MODULUS_SIZE];
uint16 g_server_rdp_version = 0;
/* These values must be available to reset state - Session Directory */
! static int sec_encrypt_use_count = 0;
! static int sec_decrypt_use_count = 0;
/*
--- 34,57 ----
extern RD_BOOL g_console_session;
extern int g_server_depth;
extern VCHANNEL g_channels[];
extern unsigned int g_num_channels;
! static int g_rc4_key_len;
! static SSL_RC4 g_rc4_decrypt_key;
! static SSL_RC4 g_rc4_encrypt_key;
! static uint32 g_server_public_key_len;
! static uint8 g_sec_sign_key[16];
! static uint8 g_sec_decrypt_key[16];
! static uint8 g_sec_encrypt_key[16];
! static uint8 g_sec_decrypt_update_key[16];
! static uint8 g_sec_encrypt_update_key[16];
! static uint8 g_sec_crypted_random[SEC_MAX_MODULUS_SIZE];
uint16 g_server_rdp_version = 0;
/* These values must be available to reset state - Session Directory */
! static int g_sec_encrypt_use_count = 0;
! static int g_sec_decrypt_use_count = 0;
/*
***************
*** 138,168 ****
/* First 16 bytes of key material is MAC secret */
! memcpy(sec_sign_key, key_block, 16);
/* Generate export keys from next two blocks of 16 bytes */
! sec_hash_16(sec_decrypt_key, &key_block[16], client_random, server_random);
! sec_hash_16(sec_encrypt_key, &key_block[32], client_random, server_random);
if (rc4_key_size == 1)
{
DEBUG(("40-bit encryption enabled\n"));
! sec_make_40bit(sec_sign_key);
! sec_make_40bit(sec_decrypt_key);
! sec_make_40bit(sec_encrypt_key);
! rc4_key_len = 8;
}
else
{
DEBUG(("rc_4_key_size == %d, 128-bit encryption enabled\n", rc4_key_size));
! rc4_key_len = 16;
}
/* Save initial RC4 keys as update keys */
! memcpy(sec_decrypt_update_key, sec_decrypt_key, 16);
! memcpy(sec_encrypt_update_key, sec_encrypt_key, 16);
/* Initialise RC4 state arrays */
! ssl_rc4_set_key(&rc4_decrypt_key, sec_decrypt_key, rc4_key_len);
! ssl_rc4_set_key(&rc4_encrypt_key, sec_encrypt_key, rc4_key_len);
}
--- 137,167 ----
/* First 16 bytes of key material is MAC secret */
! memcpy(g_sec_sign_key, key_block, 16);
/* Generate export keys from next two blocks of 16 bytes */
! sec_hash_16(g_sec_decrypt_key, &key_block[16], client_random, server_random);
! sec_hash_16(g_sec_encrypt_key, &key_block[32], client_random, server_random);
if (rc4_key_size == 1)
{
DEBUG(("40-bit encryption enabled\n"));
! sec_make_40bit(g_sec_sign_key);
! sec_make_40bit(g_sec_decrypt_key);
! sec_make_40bit(g_sec_encrypt_key);
! g_rc4_key_len = 8;
}
else
{
DEBUG(("rc_4_key_size == %d, 128-bit encryption enabled\n", rc4_key_size));
! g_rc4_key_len = 16;
}
/* Save initial RC4 keys as update keys */
! memcpy(g_sec_decrypt_update_key, g_sec_decrypt_key, 16);
! memcpy(g_sec_encrypt_update_key, g_sec_encrypt_key, 16);
/* Initialise RC4 state arrays */
! ssl_rc4_set_key(&g_rc4_decrypt_key, g_sec_decrypt_key, g_rc4_key_len);
! ssl_rc4_set_key(&g_rc4_encrypt_key, g_sec_encrypt_key, g_rc4_key_len);
}
***************
*** 229,247 ****
ssl_sha1_init(&sha1);
! ssl_sha1_update(&sha1, update_key, rc4_key_len);
ssl_sha1_update(&sha1, pad_54, 40);
! ssl_sha1_update(&sha1, key, rc4_key_len);
ssl_sha1_final(&sha1, shasig);
ssl_md5_init(&md5);
! ssl_md5_update(&md5, update_key, rc4_key_len);
ssl_md5_update(&md5, pad_92, 48);
ssl_md5_update(&md5, shasig, 20);
ssl_md5_final(&md5, key);
! ssl_rc4_set_key(&update, key, rc4_key_len);
! ssl_rc4_crypt(&update, key, key, rc4_key_len);
! if (rc4_key_len == 8)
sec_make_40bit(key);
}
--- 228,246 ----
ssl_sha1_init(&sha1);
! ssl_sha1_update(&sha1, update_key, g_rc4_key_len);
ssl_sha1_update(&sha1, pad_54, 40);
! ssl_sha1_update(&sha1, key, g_rc4_key_len);
ssl_sha1_final(&sha1, shasig);
ssl_md5_init(&md5);
! ssl_md5_update(&md5, update_key, g_rc4_key_len);
ssl_md5_update(&md5, pad_92, 48);
ssl_md5_update(&md5, shasig, 20);
ssl_md5_final(&md5, key);
! ssl_rc4_set_key(&update, key, g_rc4_key_len);
! ssl_rc4_crypt(&update, key, key, g_rc4_key_len);
! if (g_rc4_key_len == 8)
sec_make_40bit(key);
}
***************
*** 251,263 ****
sec_encrypt(uint8 * data, int length)
{
! if (sec_encrypt_use_count == 4096)
{
! sec_update(sec_encrypt_key, sec_encrypt_update_key);
! ssl_rc4_set_key(&rc4_encrypt_key, sec_encrypt_key, rc4_key_len);
! sec_encrypt_use_count = 0;
}
! ssl_rc4_crypt(&rc4_encrypt_key, data, data, length);
! sec_encrypt_use_count++;
}
--- 250,262 ----
sec_encrypt(uint8 * data, int length)
{
! if (g_sec_encrypt_use_count == 4096)
{
! sec_update(g_sec_encrypt_key, g_sec_encrypt_update_key);
! ssl_rc4_set_key(&g_rc4_encrypt_key, g_sec_encrypt_key, g_rc4_key_len);
! g_sec_encrypt_use_count = 0;
}
! ssl_rc4_crypt(&g_rc4_encrypt_key, data, data, length);
! g_sec_encrypt_use_count++;
}
***************
*** 266,278 ****
sec_decrypt(uint8 * data, int length)
{
! if (sec_decrypt_use_count == 4096)
{
! sec_update(sec_decrypt_key, sec_decrypt_update_key);
! ssl_rc4_set_key(&rc4_decrypt_key, sec_decrypt_key, rc4_key_len);
! sec_decrypt_use_count = 0;
}
! ssl_rc4_crypt(&rc4_decrypt_key, data, data, length);
! sec_decrypt_use_count++;
}
--- 265,277 ----
sec_decrypt(uint8 * data, int length)
{
! if (g_sec_decrypt_use_count == 4096)
{
! sec_update(g_sec_decrypt_key, g_sec_decrypt_update_key);
! ssl_rc4_set_key(&g_rc4_decrypt_key, g_sec_decrypt_key, g_rc4_key_len);
! g_sec_decrypt_use_count = 0;
}
! ssl_rc4_crypt(&g_rc4_decrypt_key, data, data, length);
! g_sec_decrypt_use_count++;
}
***************
*** 326,330 ****
#endif
! sec_sign(s->p, 8, sec_sign_key, rc4_key_len, s->p + 8, datalen);
sec_encrypt(s->p + 8, datalen);
}
--- 325,329 ----
#endif
! sec_sign(s->p, 8, g_sec_sign_key, g_rc4_key_len, s->p + 8, datalen);
sec_encrypt(s->p + 8, datalen);
}
***************
*** 350,354 ****
sec_establish_key(void)
{
! uint32 length = server_public_key_len + SEC_PADDING_SIZE;
uint32 flags = SEC_CLIENT_RANDOM;
STREAM s;
--- 349,353 ----
sec_establish_key(void)
{
! uint32 length = g_server_public_key_len + SEC_PADDING_SIZE;
uint32 flags = SEC_CLIENT_RANDOM;
STREAM s;
***************
*** 357,361 ****
out_uint32_le(s, length);
! out_uint8p(s, sec_crypted_random, server_public_key_len);
out_uint8s(s, SEC_PADDING_SIZE);
--- 356,360 ----
out_uint32_le(s, length);
! out_uint8p(s, g_sec_crypted_random, g_server_public_key_len);
out_uint8s(s, SEC_PADDING_SIZE);
***************
*** 480,484 ****
in_uint8a(s, modulus, modulus_len);
in_uint8s(s, SEC_PADDING_SIZE);
! server_public_key_len = modulus_len;
return s_check(s);
--- 479,483 ----
in_uint8a(s, modulus, modulus_len);
in_uint8s(s, SEC_PADDING_SIZE);
! g_server_public_key_len = modulus_len;
return s_check(s);
***************
*** 499,503 ****
sig_len = len - 8;
in_uint8a(s, signature, sig_len);
! return ssl_sig_ok(exponent, SEC_EXPONENT_SIZE, modulus, server_public_key_len,
signature, sig_len);
}
--- 498,502 ----
sig_len = len - 8;
in_uint8a(s, signature, sig_len);
! return ssl_sig_ok(exponent, SEC_EXPONENT_SIZE, modulus, g_server_public_key_len,
signature, sig_len);
}
***************
*** 636,640 ****
ssl_cert_free(cacert);
in_uint8s(s, 16); /* Padding */
! server_public_key = ssl_cert_to_rkey(server_cert, &server_public_key_len);
if (NULL == server_public_key)
{
--- 635,639 ----
ssl_cert_free(cacert);
in_uint8s(s, 16); /* Padding */
! server_public_key = ssl_cert_to_rkey(server_cert, &g_server_public_key_len);
if (NULL == server_public_key)
{
***************
*** 644,651 ****
}
ssl_cert_free(server_cert);
! if ((server_public_key_len < SEC_MODULUS_SIZE) ||
! (server_public_key_len > SEC_MAX_MODULUS_SIZE))
{
! error("Bad server public key size (%u bits)\n", server_public_key_len * 8);
ssl_rkey_free(server_public_key);
return False;
--- 643,650 ----
}
ssl_cert_free(server_cert);
! if ((g_server_public_key_len < SEC_MODULUS_SIZE) ||
! (g_server_public_key_len > SEC_MAX_MODULUS_SIZE))
{
! error("Bad server public key size (%u bits)\n", g_server_public_key_len * 8);
ssl_rkey_free(server_public_key);
return False;
***************
*** 683,688 ****
DEBUG(("Generating client random\n"));
generate_random(client_random);
! sec_rsa_encrypt(sec_crypted_random, client_random, SEC_RANDOM_SIZE,
! server_public_key_len, modulus, exponent);
sec_generate_keys(client_random, server_random, rc4_key_size);
}
--- 682,687 ----
DEBUG(("Generating client random\n"));
generate_random(client_random);
! sec_rsa_encrypt(g_sec_crypted_random, client_random, SEC_RANDOM_SIZE,
! g_server_public_key_len, modulus, exponent);
sec_generate_keys(client_random, server_random, rc4_key_size);
}
***************
*** 891,896 ****
{
g_server_rdp_version = 0;
! sec_encrypt_use_count = 0;
! sec_decrypt_use_count = 0;
mcs_reset_state();
}
--- 890,895 ----
{
g_server_rdp_version = 0;
! g_sec_encrypt_use_count = 0;
! g_sec_decrypt_use_count = 0;
mcs_reset_state();
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642