CVS: rdesktop secure.c,1.57,1.58
Peter Ã
strand <[email protected]> Wed, 21 Jun 2006 07:40:04 -0700
| Newsgroups | gmane.network.rdesktop.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15166
Modified Files:
secure.c
Log Message:
Indent fixes
Index: secure.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/secure.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** secure.c 14 Jun 2006 08:26:00 -0000 1.57
--- secure.c 21 Jun 2006 14:40:02 -0000 1.58
***************
*** 299,303 ****
/* Perform an RSA public key encryption operation */
static void
! sec_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus, uint8 * exponent)
{
BN_CTX *ctx;
--- 299,304 ----
/* Perform an RSA public key encryption operation */
static void
! sec_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus,
! uint8 * exponent)
{
BN_CTX *ctx;
***************
*** 394,398 ****
STREAM s;
! s = sec_init(flags, length+4);
out_uint32_le(s, length);
--- 395,399 ----
STREAM s;
! s = sec_init(flags, length + 4);
out_uint32_le(s, length);
***************
*** 512,516 ****
if ((modulus_len < 64) || (modulus_len > SEC_MAX_MODULUS_SIZE))
{
! error("Bad server public key size (%u bits)\n", modulus_len*8);
return False;
}
--- 513,517 ----
if ((modulus_len < 64) || (modulus_len > SEC_MAX_MODULUS_SIZE))
{
! error("Bad server public key size (%u bits)\n", modulus_len * 8);
return False;
}
***************
*** 553,557 ****
if ((server_public_key_len < 64) || (server_public_key_len > SEC_MAX_MODULUS_SIZE))
{
! error("Bad server public key size (%u bits)\n", server_public_key_len*8);
return False;
}
--- 554,558 ----
if ((server_public_key_len < 64) || (server_public_key_len > SEC_MAX_MODULUS_SIZE))
{
! error("Bad server public key size (%u bits)\n", server_public_key_len * 8);
return False;
}
***************
*** 749,756 ****
/* *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!
*/
memcpy(inr + padding_len, client_random, SEC_RANDOM_SIZE);
--- 750,757 ----
/* *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!
*/
memcpy(inr + padding_len, client_random, SEC_RANDOM_SIZE);
***************
*** 768,772 ****
{ /* RDP4-style encryption */
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);
--- 769,774 ----
{ /* RDP4-style encryption */
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);