CVS: rdesktop licence.c,1.30,1.31 secure.c,1.44,1.45 xkeymap.c,1.63,1.64 xwin.c,1.169,1.170

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18594

Modified Files:
	licence.c secure.c xkeymap.c xwin.c 
Log Message:
Indent fixes

Index: licence.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/licence.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** licence.c	16 May 2004 11:18:20 -0000	1.30
--- licence.c	1 Jun 2004 08:06:02 -0000	1.31
***************
*** 44,48 ****
  	/* 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');
  
  	/* Store first 16 bytes of session key as MAC secret */
--- 44,48 ----
  	/* 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');
  
  	/* Store first 16 bytes of session key as MAC secret */

Index: secure.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/secure.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** secure.c	16 May 2004 11:18:20 -0000	1.44
--- secure.c	1 Jun 2004 08:06:02 -0000	1.45
***************
*** 135,144 ****
  
  	/* Construct pre-master secret */
! 	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');
  
  	/* First 16 bytes of key material is MAC secret */
--- 135,144 ----
  
  	/* Construct pre-master secret */
! 	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');
  
  	/* First 16 bytes of key material is MAC secret */

Index: xkeymap.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xkeymap.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** xkeymap.c	1 Jun 2004 08:00:58 -0000	1.63
--- xkeymap.c	1 Jun 2004 08:06:02 -0000	1.64
***************
*** 657,661 ****
  
  	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))
  		rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RALT);
  
--- 657,662 ----
  
  	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))
  		rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RALT);
  

Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -d -r1.169 -r1.170
*** xwin.c	27 May 2004 10:19:41 -0000	1.169
--- xwin.c	1 Jun 2004 08:06:02 -0000	1.170
***************
*** 173,179 ****
  {
  	PixelColour rv;
! 	rv.red = ((colour >> 7 ) & 0xf8) | ((colour >> 12) & 0x7);
  	rv.green = ((colour >> 2) & 0xf8) | ((colour >> 8) & 0x7);
! 	rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2)  & 0x7);
  	return rv;
  }
--- 173,179 ----
  {
  	PixelColour rv;
! 	rv.red = ((colour >> 7) & 0xf8) | ((colour >> 12) & 0x7);
  	rv.green = ((colour >> 2) & 0xf8) | ((colour >> 8) & 0x7);
! 	rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2) & 0x7);
  	return rv;
  }
***************
*** 183,189 ****
  {
  	PixelColour rv;
! 	rv.red = ((colour >> 8 ) & 0xf8) | ((colour >> 13) & 0x7);
  	rv.green = ((colour >> 3) & 0xfc) | ((colour >> 9) & 0x3);
! 	rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2)  & 0x7);
  	return rv;
  }
--- 183,189 ----
  {
  	PixelColour rv;
! 	rv.red = ((colour >> 8) & 0xf8) | ((colour >> 13) & 0x7);
  	rv.green = ((colour >> 3) & 0xfc) | ((colour >> 9) & 0x3);
! 	rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2) & 0x7);
  	return rv;
  }
***************
*** 253,258 ****
  
  	if (g_arch_match)
! 		REPEAT(*((uint16 *) out) = g_colmap[*(data++)]; out += 2;
! 		)
  	else
  if (g_xserver_be)
--- 253,258 ----
  
  	if (g_arch_match)
! 		REPEAT(*((uint16 *) out) = g_colmap[*(data++)];
! 		       out += 2;)
  	else
  if (g_xserver_be)
***************
*** 310,315 ****
  
  	if (g_arch_match)
! 		REPEAT(*((uint32 *) out) = g_colmap[*(data++)]; out += 4;
! 		)
  	else
  if (g_xserver_be)
--- 310,315 ----
  
  	if (g_arch_match)
! 		REPEAT(*((uint32 *) out) = g_colmap[*(data++)];
! 		       out += 4;)
  	else
  if (g_xserver_be)



-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click