[Trousers-cvs] trousers/src/tcs/rpc/tcstp rpc_daa.c

[Kent Y. <ky...@us...>]

Update of /cvsroot/trousers/trousers/src/tcs/rpc/tcstp
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32713/src/tcs/rpc/tcstp

Modified Files:
	rpc_daa.c 
Log Message:
replaced TSPERR with TCSERR

Index: rpc_daa.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/tcs/rpc/tcstp/rpc_daa.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rpc_daa.c	17 Jul 2007 18:29:13 -0000	1.3
--- rpc_daa.c	4 Jan 2008 17:04:13 -0000	1.4
***************
*** 32,36 ****
  {
  	TCS_CONTEXT_HANDLE hContext;
! 	TSS_HDAA hDAA;
  	BYTE stage;
  	UINT32 inputSize0, inputSize1, outputSize, i;
--- 32,36 ----
  {
  	TCS_CONTEXT_HANDLE hContext;
! 	TPM_HANDLE hDAA;
  	BYTE stage;
  	UINT32 inputSize0, inputSize1, outputSize, i;
***************
*** 43,55 ****
  
  	LogDebugFn("thread %zd hDAA %x", THREAD_ID, hDAA);
  	if (getData(TCSD_PACKET_TYPE_UINT32, 1, &hDAA, 0, &data->comm))
! 		return TSPERR(TSS_E_INTERNAL_ERROR);
  
  	if (getData(TCSD_PACKET_TYPE_BYTE, 2, &stage, 0, &data->comm))
! 		return TSPERR(TSS_E_INTERNAL_ERROR);
  	LogDebug("getData 2 (stage=%d)", (int)stage);
  
  	if (getData(TCSD_PACKET_TYPE_UINT32, 3, &inputSize0, 0, &data->comm))
! 		return TSPERR(TSS_E_INTERNAL_ERROR);
  	LogDebug("getData 3  inputSize0=%d", inputSize0);
  
--- 43,56 ----
  
  	LogDebugFn("thread %zd hDAA %x", THREAD_ID, hDAA);
+ 
  	if (getData(TCSD_PACKET_TYPE_UINT32, 1, &hDAA, 0, &data->comm))
! 		return TCSERR(TSS_E_INTERNAL_ERROR);
  
  	if (getData(TCSD_PACKET_TYPE_BYTE, 2, &stage, 0, &data->comm))
! 		return TCSERR(TSS_E_INTERNAL_ERROR);
  	LogDebug("getData 2 (stage=%d)", (int)stage);
  
  	if (getData(TCSD_PACKET_TYPE_UINT32, 3, &inputSize0, 0, &data->comm))
! 		return TCSERR(TSS_E_INTERNAL_ERROR);
  	LogDebug("getData 3  inputSize0=%d", inputSize0);
  
***************
*** 69,73 ****
  	if (getData(TCSD_PACKET_TYPE_UINT32, 5, &inputSize1, 0, &data->comm)) {
  		free( inputData0);
! 		return TSPERR(TSS_E_INTERNAL_ERROR);
  	}
  	LogDebug("getData 5  inputSize1=%d", inputSize1);
--- 70,74 ----
  	if (getData(TCSD_PACKET_TYPE_UINT32, 5, &inputSize1, 0, &data->comm)) {
  		free( inputData0);
! 		return TCSERR(TSS_E_INTERNAL_ERROR);
  	}
  	LogDebug("getData 5  inputSize1=%d", inputSize1);
***************
*** 135,139 ****
  {
  	TCS_CONTEXT_HANDLE hContext;
! 	TSS_HDAA hDAA;
  	BYTE stage;
  	UINT32 inputSize0, inputSize1, outputSize, i;
--- 136,140 ----
  {
  	TCS_CONTEXT_HANDLE hContext;
! 	TPM_HANDLE hDAA;
  	BYTE stage;
  	UINT32 inputSize0, inputSize1, outputSize, i;
***************
*** 147,158 ****
  	LogDebugFn("thread %zd hDAA %x", THREAD_ID, hDAA);
  	if (getData(TCSD_PACKET_TYPE_UINT32, 1, &hDAA, 0, &data->comm))
! 		return TSPERR(TSS_E_INTERNAL_ERROR);
  
  	if (getData(TCSD_PACKET_TYPE_BYTE, 2, &stage, 0, &data->comm))
! 		return TSPERR(TSS_E_INTERNAL_ERROR);
  	LogDebugFn("getData 2 (stage=%d)", (int)stage);
  
  	if (getData(TCSD_PACKET_TYPE_UINT32, 3, &inputSize0, 0, &data->comm))
! 		return TSPERR(TSS_E_INTERNAL_ERROR);
  	LogDebug("getData 3  inputSize0=%d", inputSize0);
  
--- 148,159 ----
  	LogDebugFn("thread %zd hDAA %x", THREAD_ID, hDAA);
  	if (getData(TCSD_PACKET_TYPE_UINT32, 1, &hDAA, 0, &data->comm))
! 		return TCSERR(TSS_E_INTERNAL_ERROR);
  
  	if (getData(TCSD_PACKET_TYPE_BYTE, 2, &stage, 0, &data->comm))
! 		return TCSERR(TSS_E_INTERNAL_ERROR);
  	LogDebugFn("getData 2 (stage=%d)", (int)stage);
  
  	if (getData(TCSD_PACKET_TYPE_UINT32, 3, &inputSize0, 0, &data->comm))
! 		return TCSERR(TSS_E_INTERNAL_ERROR);
  	LogDebug("getData 3  inputSize0=%d", inputSize0);
  
***************
*** 172,176 ****
  	if (getData(TCSD_PACKET_TYPE_UINT32, 5, &inputSize1, 0, &data->comm)) {
  		free( inputData0);
! 		return TSPERR(TSS_E_INTERNAL_ERROR);
  	}
  	LogDebug("getData 5  inputSize1=%d", inputSize1);
--- 173,177 ----
  	if (getData(TCSD_PACKET_TYPE_UINT32, 5, &inputSize1, 0, &data->comm)) {
  		free( inputData0);
! 		return TCSERR(TSS_E_INTERNAL_ERROR);
  	}
  	LogDebug("getData 5  inputSize1=%d", inputSize1);