CVS: rdesktop scard.c,1.8,1.9

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

Modified Files:
	scard.c 
Log Message:
increase padding.
this seems to fix disconnects with encryption-errors reported in the
TS log


Index: scard.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/scard.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** scard.c	2 Nov 2006 21:32:56 -0000	1.8
--- scard.c	2 Nov 2006 23:12:25 -0000	1.9
***************
*** 498,502 ****
  
  static void
! outForceAllignment(STREAM out, unsigned int seed)
  {
  	SERVER_DWORD add = (seed - (out->p - out->data) % seed) % seed;
--- 498,502 ----
  
  static void
! outForceAlignment(STREAM out, unsigned int seed)
  {
  	SERVER_DWORD add = (seed - (out->p - out->data) % seed) % seed;
***************
*** 697,701 ****
  	}
  
! 	outForceAllignment(out, 8);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
--- 697,701 ----
  	}
  
! 	outForceAlignment(out, 16);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
***************
*** 770,774 ****
  	out->p = pend;
  
! 	outForceAllignment(out, 8);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
--- 770,774 ----
  	out->p = pend;
  
! 	outForceAlignment(out, 16);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
***************
*** 845,849 ****
  	out_uint32_le(out, hCard);
  
! 	outForceAllignment(out, 8);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
--- 845,849 ----
  	out_uint32_le(out, hCard);
  
! 	outForceAlignment(out, 16);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
***************
*** 888,892 ****
  	}
  
! 	outForceAllignment(out, 8);
  	out_uint32_le(out, (SERVER_DWORD) dwActiveProtocol);
  	return rv;
--- 888,892 ----
  	}
  
! 	outForceAlignment(out, 16);
  	out_uint32_le(out, (SERVER_DWORD) dwActiveProtocol);
  	return rv;
***************
*** 944,948 ****
  	}
  
! 	outForceAllignment(out, 8);
  	return rv;
  }
--- 944,948 ----
  	}
  
! 	outForceAlignment(out, 16);
  	return rv;
  }
***************
*** 1201,1205 ****
  			   sizeof(SERVER_SCARD_READERSTATE_A) - 2 * sizeof(unsigned char *));
  	}
! 	outForceAllignment(out, 8);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
--- 1201,1205 ----
  			   sizeof(SERVER_SCARD_READERSTATE_A) - 2 * sizeof(unsigned char *));
  	}
! 	outForceAlignment(out, 16);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
***************
*** 1225,1229 ****
  		DEBUG_SCARD(("<--SUCCESS SCardCancel-->\n"));
  	}
! 	outForceAllignment(out, 8);
  	return rv;
  }
--- 1225,1229 ----
  		DEBUG_SCARD(("<--SUCCESS SCardCancel-->\n"));
  	}
! 	outForceAlignment(out, 16);
  	return rv;
  }
***************
*** 1330,1334 ****
  	}
  
! 	outForceAllignment(out, 8);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
--- 1330,1334 ----
  	}
  
! 	outForceAlignment(out, 16);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
***************
*** 1356,1360 ****
  		DEBUG_SCARD(("<--SUCCESS SCardBeginTransaction-->\n"));
  	}
! 	outForceAllignment(out, 8);
  	return rv;
  }
--- 1356,1360 ----
  		DEBUG_SCARD(("<--SUCCESS SCardBeginTransaction-->\n"));
  	}
! 	outForceAlignment(out, 16);
  	return rv;
  }
***************
*** 1387,1391 ****
  		DEBUG_SCARD(("<--SUCCESS SCardEndTransaction-->\n"));
  	}
! 	outForceAllignment(out, 8);
  	return rv;
  }
--- 1387,1391 ----
  		DEBUG_SCARD(("<--SUCCESS SCardEndTransaction-->\n"));
  	}
! 	outForceAlignment(out, 16);
  	return rv;
  }
***************
*** 1630,1634 ****
  		outBufferFinish(out, (char *) recvBuf, cbRecvLength);
  	}
! 	outForceAllignment(out, 8);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
--- 1630,1634 ----
  		outBufferFinish(out, (char *) recvBuf, cbRecvLength);
  	}
! 	outForceAlignment(out, 16);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
***************
*** 1746,1750 ****
  		out->p = psave;
  	}
! 	outForceAllignment(out, 8);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
--- 1746,1750 ----
  		out->p = psave;
  	}
! 	outForceAlignment(out, 16);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
***************
*** 1840,1844 ****
  		outRepos(out, dwAtrLen);
  	}
! 	outForceAllignment(out, 8);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
--- 1840,1844 ----
  		outRepos(out, dwAtrLen);
  	}
! 	outForceAlignment(out, 16);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
***************
*** 1893,1897 ****
  	out_uint32_le(out, 0x00000000);
  
! 	outForceAllignment(out, 8);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
--- 1893,1897 ----
  	out_uint32_le(out, 0x00000000);
  
! 	outForceAlignment(out, 16);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
***************
*** 1994,1998 ****
  		out_uint32_le(out, 0x00000000);
  	}
! 	outForceAllignment(out, 8);
  	return rv;
  }
--- 1994,1998 ----
  		out_uint32_le(out, 0x00000000);
  	}
! 	outForceAlignment(out, 16);
  	return rv;
  }
***************
*** 2047,2051 ****
  	out_uint32_le(out, 0x00000000);
  	out_uint32_le(out, 0x00000000);
! 	outForceAllignment(out, 8);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
--- 2047,2051 ----
  	out_uint32_le(out, 0x00000000);
  	out_uint32_le(out, 0x00000000);
! 	outForceAlignment(out, 16);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
***************
*** 2160,2164 ****
  	}
  
! 	outForceAllignment(out, 8);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;
--- 2160,2164 ----
  	}
  
! 	outForceAlignment(out, 16);
  	SC_xfreeallmemory(&lcHandle);
  	return rv;


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642