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

Indented with indent-all.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/rdesktop/trunk@1670 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Peter Åstrand 2012-10-23 11:38:27 +00:00
parent 619adfcc35
commit 5cb7910413
8 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rdp.c
View File

@ -475,7 +475,7 @@ rdp_send_logon_info(uint32 flags, char *domain, char *user,
out_uint32_le(s, 1); /* Version */ out_uint32_le(s, 1); /* Version */
out_uint32_le(s, g_reconnect_logonid); /* LogonId */ out_uint32_le(s, g_reconnect_logonid); /* LogonId */
rdssl_hmac_md5(g_reconnect_random, sizeof(g_reconnect_random), rdssl_hmac_md5(g_reconnect_random, sizeof(g_reconnect_random),
g_client_random, SEC_RANDOM_SIZE, security_verifier); g_client_random, SEC_RANDOM_SIZE, security_verifier);
out_uint8a(s, security_verifier, sizeof(security_verifier)); out_uint8a(s, security_verifier, sizeof(security_verifier));
} }
else else

2
rdpsnd_oss.c
View File

@ -261,7 +261,7 @@ oss_set_format(RD_WAVEFORMATEX * pwfx)
if ((pwfx->wBitsPerSample == 16) && (format != AFMT_S16_LE)) if ((pwfx->wBitsPerSample == 16) && (format != AFMT_S16_LE))
return False; return False;
if ((pwfx->nChannels == 2) != ! !stereo) if ((pwfx->nChannels == 2) != !!stereo)
return False; return False;
if (pwfx->nSamplesPerSec != snd_rate) if (pwfx->nSamplesPerSec != snd_rate)

2
rdpsnd_sun.c
View File

@ -304,7 +304,7 @@ sun_set_format(RD_WAVEFORMATEX * pwfx)
if ((pwfx->wBitsPerSample == 16) && (format != AUDIO_ENCODING_LINEAR)) if ((pwfx->wBitsPerSample == 16) && (format != AUDIO_ENCODING_LINEAR))
return False; return False;
if ((pwfx->nChannels == 2) != ! !stereo) if ((pwfx->nChannels == 2) != !!stereo)
return False; return False;
if (pwfx->nSamplesPerSec != snd_rate) if (pwfx->nSamplesPerSec != snd_rate)

2
seamless.c
View File

@ -316,7 +316,7 @@ seamless_process_line(const char *line, void *data)
if (*endptr) if (*endptr)
return False; return False;
ui_seamless_begin(! !(flags & SEAMLESSRDP_HELLO_HIDDEN)); ui_seamless_begin(!!(flags & SEAMLESSRDP_HELLO_HIDDEN));
} }
else if (!strcmp("ACK", tok1)) else if (!strcmp("ACK", tok1))
{ {

4
secure.c
View File

@ -526,7 +526,7 @@ sec_parse_public_sig(STREAM s, uint32 len, uint8 * modulus, uint8 * exponent)
sig_len = len - 8; sig_len = len - 8;
in_uint8a(s, signature, sig_len); in_uint8a(s, signature, sig_len);
return rdssl_sig_ok(exponent, SEC_EXPONENT_SIZE, modulus, g_server_public_key_len, return rdssl_sig_ok(exponent, SEC_EXPONENT_SIZE, modulus, g_server_public_key_len,
signature, sig_len); signature, sig_len);
} }
/* Parse a crypto information structure */ /* Parse a crypto information structure */
@ -683,7 +683,7 @@ sec_parse_crypt_info(STREAM s, uint32 * rc4_key_size,
return False; return False;
} }
if (rdssl_rkey_get_exp_mod(server_public_key, exponent, SEC_EXPONENT_SIZE, if (rdssl_rkey_get_exp_mod(server_public_key, exponent, SEC_EXPONENT_SIZE,
modulus, SEC_MAX_MODULUS_SIZE) != 0) modulus, SEC_MAX_MODULUS_SIZE) != 0)
{ {
error("Problem extracting RSA exponent, modulus"); error("Problem extracting RSA exponent, modulus");
rdssl_rkey_free(server_public_key); rdssl_rkey_free(server_public_key);

9
ssl.c
View File

@ -85,7 +85,7 @@ reverse(uint8 * p, int len)
void void
rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus, rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus,
uint8 * exponent) uint8 * exponent)
{ {
BN_CTX *ctx; BN_CTX *ctx;
BIGNUM mod, exp, x, y; BIGNUM mod, exp, x, y;
@ -197,7 +197,7 @@ rdssl_rkey_free(RDSSL_RKEY * rkey)
/* returns error */ /* returns error */
int int
rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len, uint8 * modulus, rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len, uint8 * modulus,
uint32 max_mod_len) uint32 max_mod_len)
{ {
int len; int len;
@ -216,7 +216,7 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len,
/* returns boolean */ /* returns boolean */
RD_BOOL RD_BOOL
rdssl_sig_ok(uint8 * exponent, uint32 exp_len, uint8 * modulus, uint32 mod_len, rdssl_sig_ok(uint8 * exponent, uint32 exp_len, uint8 * modulus, uint32 mod_len,
uint8 * signature, uint32 sig_len) uint8 * signature, uint32 sig_len)
{ {
/* Currently, we don't check the signature /* Currently, we don't check the signature
FIXME: FIXME:
@ -226,7 +226,8 @@ rdssl_sig_ok(uint8 * exponent, uint32 exp_len, uint8 * modulus, uint32 mod_len,
void void
rdssl_hmac_md5(const void *key, int key_len, const unsigned char *msg, int msg_len, unsigned char *md) rdssl_hmac_md5(const void *key, int key_len, const unsigned char *msg, int msg_len,
unsigned char *md)
{ {
HMAC_CTX ctx; HMAC_CTX ctx;
HMAC_CTX_init(&ctx); HMAC_CTX_init(&ctx);

8
ssl.h
View File

@ -49,7 +49,7 @@ void rdssl_md5_final(RDSSL_MD5 * md5, uint8 * out_data);
void rdssl_rc4_set_key(RDSSL_RC4 * rc4, uint8 * key, uint32 len); void rdssl_rc4_set_key(RDSSL_RC4 * rc4, uint8 * key, uint32 len);
void rdssl_rc4_crypt(RDSSL_RC4 * rc4, uint8 * in_data, uint8 * out_data, uint32 len); void rdssl_rc4_crypt(RDSSL_RC4 * rc4, uint8 * in_data, uint8 * out_data, uint32 len);
void rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus, void rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus,
uint8 * exponent); uint8 * exponent);
RDSSL_CERT *rdssl_cert_read(uint8 * data, uint32 len); RDSSL_CERT *rdssl_cert_read(uint8 * data, uint32 len);
void rdssl_cert_free(RDSSL_CERT * cert); void rdssl_cert_free(RDSSL_CERT * cert);
RDSSL_RKEY *rdssl_cert_to_rkey(RDSSL_CERT * cert, uint32 * key_len); RDSSL_RKEY *rdssl_cert_to_rkey(RDSSL_CERT * cert, uint32 * key_len);
@ -57,11 +57,11 @@ RD_BOOL rdssl_certs_ok(RDSSL_CERT * server_cert, RDSSL_CERT * cacert);
int rdssl_cert_print_fp(FILE * fp, RDSSL_CERT * cert); int rdssl_cert_print_fp(FILE * fp, RDSSL_CERT * cert);
void rdssl_rkey_free(RDSSL_RKEY * rkey); void rdssl_rkey_free(RDSSL_RKEY * rkey);
int rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len, uint8 * modulus, int rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len, uint8 * modulus,
uint32 max_mod_len); uint32 max_mod_len);
RD_BOOL rdssl_sig_ok(uint8 * exponent, uint32 exp_len, uint8 * modulus, uint32 mod_len, RD_BOOL rdssl_sig_ok(uint8 * exponent, uint32 exp_len, uint8 * modulus, uint32 mod_len,
uint8 * signature, uint32 sig_len); uint8 * signature, uint32 sig_len);
void rdssl_hmac_md5(const void *key, int key_len, void rdssl_hmac_md5(const void *key, int key_len,
const unsigned char *msg, int msg_len, unsigned char *md); const unsigned char *msg, int msg_len, unsigned char *md);
#endif #endif

3
xwin.c
View File

@ -772,7 +772,8 @@ seamless_restack_test()
} }
/* Destroy windows */ /* Destroy windows */
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++)
{
XDestroyWindow(g_display, wnds[i]); XDestroyWindow(g_display, wnds[i]);
do do
{ {