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@705 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Peter Åstrand 2004-06-01 08:06:02 +00:00
parent 2f85428b91
commit 030f5f0ca1
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
licence.c
View File

@ -43,7 +43,7 @@ licence_generate_keys(uint8 * client_random, uint8 * server_random, uint8 * pre_
/* Generate master secret and then key material */
sec_hash_48(master_secret, pre_master_secret, client_random, server_random, 'A');
sec_hash_48(key_block, master_secret, server_random, client_random, 'A');
sec_hash_48(key_block, master_secret, server_random, client_random, 'A');
/* Store first 16 bytes of session key as MAC secret */
memcpy(g_licence_sign_key, key_block, 16);

4
secure.c
View File

@ -134,12 +134,12 @@ sec_generate_keys(uint8 * client_random, uint8 * server_random, int rc4_key_size
uint8 key_block[48];
/* Construct pre-master secret */
memcpy(pre_master_secret, client_random, 24);
memcpy(pre_master_secret, client_random, 24);
memcpy(pre_master_secret + 24, server_random, 24);
/* Generate master secret and then key material */
sec_hash_48(master_secret, pre_master_secret, client_random, server_random, 'A');
sec_hash_48(key_block, master_secret, client_random, server_random, 'X');
sec_hash_48(key_block, master_secret, client_random, server_random, 'X');
/* First 16 bytes of key material is MAC secret */
memcpy(sec_sign_key, key_block, 16);

3
xkeymap.c
View File

@ -656,7 +656,8 @@ reset_modifier_keys()
rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LALT);
if (MASK_HAS_BITS(remote_modifier_state, MapRightAltMask) &&
!get_key_state(state, XK_Alt_R) && !get_key_state(state, XK_Mode_switch) && !get_key_state(state, XK_ISO_Level3_Shift))
!get_key_state(state, XK_Alt_R) && !get_key_state(state, XK_Mode_switch)
&& !get_key_state(state, XK_ISO_Level3_Shift))
rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RALT);
reset_winkey(ev_time);

16
xwin.c
View File

@ -172,9 +172,9 @@ static PixelColour
split_colour15(uint32 colour)
{
PixelColour rv;
rv.red = ((colour >> 7 ) & 0xf8) | ((colour >> 12) & 0x7);
rv.red = ((colour >> 7) & 0xf8) | ((colour >> 12) & 0x7);
rv.green = ((colour >> 2) & 0xf8) | ((colour >> 8) & 0x7);
rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2) & 0x7);
rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2) & 0x7);
return rv;
}
@ -182,9 +182,9 @@ static PixelColour
split_colour16(uint32 colour)
{
PixelColour rv;
rv.red = ((colour >> 8 ) & 0xf8) | ((colour >> 13) & 0x7);
rv.red = ((colour >> 8) & 0xf8) | ((colour >> 13) & 0x7);
rv.green = ((colour >> 3) & 0xfc) | ((colour >> 9) & 0x3);
rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2) & 0x7);
rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2) & 0x7);
return rv;
}
@ -252,8 +252,8 @@ translate8to16(uint8 * data, uint8 * out, uint8 * end)
uint16 value;
if (g_arch_match)
REPEAT(*((uint16 *) out) = g_colmap[*(data++)]; out += 2;
)
REPEAT(*((uint16 *) out) = g_colmap[*(data++)];
out += 2;)
else
if (g_xserver_be)
{
@ -309,8 +309,8 @@ translate8to32(uint8 * data, uint8 * out, uint8 * end)
uint32 value;
if (g_arch_match)
REPEAT(*((uint32 *) out) = g_colmap[*(data++)]; out += 4;
)
REPEAT(*((uint32 *) out) = g_colmap[*(data++)];
out += 4;)
else
if (g_xserver_be)
{