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

Indent fixes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1238 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Peter Åstrand 2006-06-21 14:40:02 +00:00
parent 797a7c980c
commit 6fa3105441
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
secure.c
View File

@ -298,7 +298,8 @@ 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, uint32 modulus_size, uint8 * modulus, uint8 * exponent) sec_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus,
uint8 * exponent)
{ {
BN_CTX *ctx; BN_CTX *ctx;
BIGNUM mod, exp, x, y; BIGNUM mod, exp, x, y;
@ -393,7 +394,7 @@ sec_establish_key(void)
uint32 flags = SEC_CLIENT_RANDOM; uint32 flags = SEC_CLIENT_RANDOM;
STREAM s; STREAM s;
s = sec_init(flags, length+4); s = sec_init(flags, length + 4);
out_uint32_le(s, length); out_uint32_le(s, length);
out_uint8p(s, sec_crypted_random, server_public_key_len); out_uint8p(s, sec_crypted_random, server_public_key_len);
@ -511,7 +512,7 @@ sec_parse_public_key(STREAM s, uint8 ** modulus, uint8 ** exponent)
modulus_len -= SEC_PADDING_SIZE; modulus_len -= SEC_PADDING_SIZE;
if ((modulus_len < 64) || (modulus_len > SEC_MAX_MODULUS_SIZE)) if ((modulus_len < 64) || (modulus_len > SEC_MAX_MODULUS_SIZE))
{ {
error("Bad server public key size (%u bits)\n", modulus_len*8); error("Bad server public key size (%u bits)\n", modulus_len * 8);
return False; return False;
} }
@ -552,7 +553,7 @@ sec_parse_x509_key(X509 * cert)
server_public_key_len = RSA_size(server_public_key); server_public_key_len = RSA_size(server_public_key);
if ((server_public_key_len < 64) || (server_public_key_len > SEC_MAX_MODULUS_SIZE)) 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); error("Bad server public key size (%u bits)\n", server_public_key_len * 8);
return False; return False;
} }
@ -748,10 +749,10 @@ sec_process_crypt_info(STREAM s)
memset(inr, 0, padding_len); memset(inr, 0, padding_len);
/* *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!
*/ */
memcpy(inr + padding_len, client_random, SEC_RANDOM_SIZE); memcpy(inr + padding_len, client_random, SEC_RANDOM_SIZE);
reverse(inr + padding_len, SEC_RANDOM_SIZE); reverse(inr + padding_len, SEC_RANDOM_SIZE);
@ -767,7 +768,8 @@ 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, server_public_key_len, 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);
} }