[Trousers-cvs] trousers/src/tcsd tcsd_wrap.c

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

Update of /cvsroot/trousers/trousers/src/tcsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24594

Modified Files:
	tcsd_wrap.c 
Log Message:
formatting only; whitespace and braces

Index: tcsd_wrap.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/tcsd/tcsd_wrap.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** tcsd_wrap.c	23 Jan 2006 20:31:52 -0000	1.28
--- tcsd_wrap.c	23 Jan 2006 21:02:00 -0000	1.29
***************
*** 423,427 ****
  	if (eKPtrSize == 0)
  		eKPtr = NULL;
- 
  	else {
  		eKPtr = calloc(1, eKPtrSize);
--- 423,426 ----
***************
*** 675,679 ****
  		return TCSERR(TSS_E_INTERNAL_ERROR);
  
- 	//result = TCSP_EvictKey_Internal(hContext, hKey);
  	result = key_mgr_evict(hContext, hKey);
  
--- 674,677 ----
***************
*** 765,776 ****
  		return TCSERR(TSS_E_INTERNAL_ERROR);
  
- 
  	LogDebug("thread %x context %x: %s", (UINT32)pthread_self(), hContext, __FUNCTION__);
  
- #if 0
- 	result = TCSP_OIAP_Internal(hContext, &authHandle, &n0);
- #else
  	result = auth_mgr_oiap(hContext, &authHandle, &n0);
! #endif
  	if (result == TSS_SUCCESS) {
  		*hdr = calloc(1, size + sizeof(UINT32) + sizeof(TCPA_NONCE));
--- 763,770 ----
  		return TCSERR(TSS_E_INTERNAL_ERROR);
  
  	LogDebug("thread %x context %x: %s", (UINT32)pthread_self(), hContext, __FUNCTION__);
  
  	result = auth_mgr_oiap(hContext, &authHandle, &n0);
! 
  	if (result == TSS_SUCCESS) {
  		*hdr = calloc(1, size + sizeof(UINT32) + sizeof(TCPA_NONCE));
***************
*** 1073,1076 ****
--- 1067,1071 ----
  	if (getData(TCSD_PACKET_TYPE_UINT32, 2, &subCapSize, 0, tsp_data))
  		return TCSERR(TSS_E_INTERNAL_ERROR);
+ 
  	subCap = calloc(1, subCapSize);
  	if (subCap == NULL) {
***************
*** 1360,1364 ****
  		return TCSERR(TSS_E_INTERNAL_ERROR);
  
- 
  	LogDebug("thread %x context %x: %s", (UINT32)pthread_self(), hContext, __FUNCTION__);
  
--- 1355,1358 ----
***************
*** 1391,1395 ****
  		return TCSERR(TSS_E_INTERNAL_ERROR);
  
- 
  	LogDebug("thread %x context %x: %s", (UINT32)pthread_self(), hContext, __FUNCTION__);
  
--- 1385,1388 ----
***************
*** 1640,1646 ****
  		pAuth = &auth;
  
- 	//result = TCSP_LoadKeyByBlob_Internal(hContext, hUnwrappingKey,
- 	//				cWrappedKeyBlob, rgbWrappedKeyBlob,
- 	//				pAuth, &phKeyTCSI, &phKeyHMAC);
  	result = key_mgr_load_by_blob(hContext, hUnwrappingKey,
  					cWrappedKeyBlob, rgbWrappedKeyBlob,
--- 1633,1636 ----
***************
*** 1712,1716 ****
  		pInfo = &info;
  
- 	//result = TCSP_LoadKeyByUUID_Internal(hContext, &uuid, pInfo, &phKeyTCSI);
  	result = key_mgr_load_by_uuid(hContext, &uuid, pInfo, &phKeyTCSI);
  
--- 1702,1705 ----
***************
*** 1771,1781 ****
  		return TCSERR(TSS_E_INTERNAL_ERROR);
  
- #if 0
- 	result = TCSP_OSAP_Internal(hContext, entityType, entityValue, nonceOddOSAP,
- 			       &authHandle, &nonceEven, &nonceEvenOSAP);
- #else
  	result = auth_mgr_osap(hContext, entityType, entityValue, nonceOddOSAP,
  			       &authHandle, &nonceEven, &nonceEvenOSAP);
- #endif
  
  	if (result == TSS_SUCCESS) {
--- 1760,1765 ----
***************
*** 2057,2065 ****
  	}
  
! 	if (!memcmp(&emptyAuth, &pubAuth, sizeof(TPM_AUTH))) {
  		pAuth = NULL;
! 	} else {
  		pAuth = &pubAuth;
- 	}
  
  	result = TCSP_Seal_Internal(hContext, keyHandle, KeyUsageAuth, PCRInfoSize, PCRInfo,
--- 2041,2048 ----
  	}
  
! 	if (!memcmp(&emptyAuth, &pubAuth, sizeof(TPM_AUTH)))
  		pAuth = NULL;
! 	else
  		pAuth = &pubAuth;
  
  	result = TCSP_Seal_Internal(hContext, keyHandle, KeyUsageAuth, PCRInfoSize, PCRInfo,
***************
*** 2366,2369 ****
--- 2349,2353 ----
  	if (getData(TCSD_PACKET_TYPE_UINT32, 4, &keyInfoSize, 0, tsp_data))
  		return TCSERR(TSS_E_INTERNAL_ERROR);
+ 
  	keyInfo = calloc(1, keyInfoSize);
  	if (keyInfo == NULL) {
***************
*** 2389,2393 ****
  		if (*hdr == NULL) {
  			LogError("malloc of %zd bytes failed.", size + sizeof(UINT32) +
! 					keyDataSize + sizeof(TPM_AUTH));
  			return TCSERR(TSS_E_OUTOFMEMORY);
  		}
--- 2373,2377 ----
  		if (*hdr == NULL) {
  			LogError("malloc of %zd bytes failed.", size + sizeof(UINT32) +
! 				 keyDataSize + sizeof(TPM_AUTH));
  			return TCSERR(TSS_E_OUTOFMEMORY);
  		}
***************
*** 2601,2605 ****
  	if (getData(TCSD_PACKET_TYPE_UINT32, 3, &pcrDataSizeIn, 0, tsp_data))
  		return TCSERR(TSS_E_INTERNAL_ERROR);
! 	pcrDataIn = (BYTE *) calloc(1, pcrDataSizeIn);
  	if (pcrDataIn == NULL) {
  		LogError("malloc of %d bytes failed.", pcrDataSizeIn);
--- 2585,2589 ----
  	if (getData(TCSD_PACKET_TYPE_UINT32, 3, &pcrDataSizeIn, 0, tsp_data))
  		return TCSERR(TSS_E_INTERNAL_ERROR);
! 	pcrDataIn = (BYTE *)calloc(1, pcrDataSizeIn);
  	if (pcrDataIn == NULL) {
  		LogError("malloc of %d bytes failed.", pcrDataSizeIn);
***************
*** 2761,2801 ****
  		}
  		if (pSRKAuth) {
! 			if (setData(TCSD_PACKET_TYPE_AUTH, i++, pSRKAuth, 0, *hdr)) {
  				goto internal_error;
- 			}
  		}
! 		if (setData(TCSD_PACKET_TYPE_AUTH, i++, &ownerAuth, 0, *hdr)) {
  			goto internal_error;
! 		}
! 		if (setData(TCSD_PACKET_TYPE_UINT32, i++, &idKeySize, 0, *hdr)) {
  			goto internal_error;
! 		}
! 		if (setData(TCSD_PACKET_TYPE_PBYTE, i++, idKey, idKeySize, *hdr)) {
  			goto internal_error;
! 		}
! 		if (setData(TCSD_PACKET_TYPE_UINT32, i++, &pcIDBindSize, 0, *hdr)) {
  			goto internal_error;
! 		}
! 		if (setData(TCSD_PACKET_TYPE_PBYTE, i++, prgbIDBind, pcIDBindSize, *hdr)) {
  			goto internal_error;
! 		}
! 		if (setData(TCSD_PACKET_TYPE_UINT32, i++, &pcECSize, 0, *hdr)) {
  			goto internal_error;
! 		}
! 		if (setData(TCSD_PACKET_TYPE_PBYTE, i++, prgbEC, pcECSize, *hdr)) {
  			goto internal_error;
! 		}
! 		if (setData(TCSD_PACKET_TYPE_UINT32, i++, &pcPlatCredSize, 0, *hdr)) {
  			goto internal_error;
! 		}
! 		if (setData(TCSD_PACKET_TYPE_PBYTE, i++, prgbPlatCred, pcPlatCredSize, *hdr)) {
  			goto internal_error;
! 		}
! 		if (setData(TCSD_PACKET_TYPE_UINT32, i++, &pcConfCredSize, 0, *hdr)) {
  			goto internal_error;
! 		}
! 		if (setData(TCSD_PACKET_TYPE_PBYTE, i++, prgbConfCred, pcConfCredSize, *hdr)) {
  			goto internal_error;
- 		}
  
  		free(idKey);
--- 2745,2773 ----
  		}
  		if (pSRKAuth) {
! 			if (setData(TCSD_PACKET_TYPE_AUTH, i++, pSRKAuth, 0, *hdr))
  				goto internal_error;
  		}
! 		if (setData(TCSD_PACKET_TYPE_AUTH, i++, &ownerAuth, 0, *hdr))
  			goto internal_error;
! 		if (setData(TCSD_PACKET_TYPE_UINT32, i++, &idKeySize, 0, *hdr))
  			goto internal_error;
! 		if (setData(TCSD_PACKET_TYPE_PBYTE, i++, idKey, idKeySize, *hdr))
  			goto internal_error;
! 		if (setData(TCSD_PACKET_TYPE_UINT32, i++, &pcIDBindSize, 0, *hdr))
  			goto internal_error;
! 		if (setData(TCSD_PACKET_TYPE_PBYTE, i++, prgbIDBind, pcIDBindSize, *hdr))
  			goto internal_error;
! 		if (setData(TCSD_PACKET_TYPE_UINT32, i++, &pcECSize, 0, *hdr))
  			goto internal_error;
! 		if (setData(TCSD_PACKET_TYPE_PBYTE, i++, prgbEC, pcECSize, *hdr))
  			goto internal_error;
! 		if (setData(TCSD_PACKET_TYPE_UINT32, i++, &pcPlatCredSize, 0, *hdr))
  			goto internal_error;
! 		if (setData(TCSD_PACKET_TYPE_PBYTE, i++, prgbPlatCred, pcPlatCredSize, *hdr))
  			goto internal_error;
! 		if (setData(TCSD_PACKET_TYPE_UINT32, i++, &pcConfCredSize, 0, *hdr))
  			goto internal_error;
! 		if (setData(TCSD_PACKET_TYPE_PBYTE, i++, prgbConfCred, pcConfCredSize, *hdr))
  			goto internal_error;
  
  		free(idKey);
***************
*** 2835,2839 ****
  	UINT32 cKeyHierarchySize;
  	TSS_KM_KEYINFO *pKeyHierarchy;
! 	unsigned int i,j;
  	TSS_RESULT result;
  	UINT32 size = sizeof(struct tcsd_packet_hdr);
--- 2807,2811 ----
  	UINT32 cKeyHierarchySize;
  	TSS_KM_KEYINFO *pKeyHierarchy;
! 	unsigned int i, j;
  	TSS_RESULT result;
  	UINT32 size = sizeof(struct tcsd_packet_hdr);
***************
*** 2941,2945 ****
  {
  	TCS_CONTEXT_HANDLE hContext;
! 	TSS_PCR_EVENT *pEvent;
  	TSS_RESULT result;
  	UINT32 size = sizeof(struct tcsd_packet_hdr);
--- 2913,2917 ----
  {
  	TCS_CONTEXT_HANDLE hContext;
! 	TSS_PCR_EVENT *pEvent = NULL;
  	TSS_RESULT result;
  	UINT32 size = sizeof(struct tcsd_packet_hdr);
***************
*** 2961,2976 ****
  		return TCSERR(TSS_E_INTERNAL_ERROR);
  
! 	if (lengthOnly) {
  		result = TCS_GetPcrEvent_Internal(hContext, pcrIndex, &number, NULL);
! 	} else {
  		result = TCS_GetPcrEvent_Internal(hContext, pcrIndex, &number, &pEvent);
- 	}
  
  	if (result == TSS_SUCCESS) {
! 		if (lengthOnly == FALSE) {
  			totalSize = get_pcr_event_size(pEvent);
! 		} else {
  			totalSize = 0;
- 		}
  
  		*hdr = calloc(1, size + sizeof(UINT32) + totalSize);
--- 2933,2946 ----
  		return TCSERR(TSS_E_INTERNAL_ERROR);
  
! 	if (lengthOnly)
  		result = TCS_GetPcrEvent_Internal(hContext, pcrIndex, &number, NULL);
! 	else
  		result = TCS_GetPcrEvent_Internal(hContext, pcrIndex, &number, &pEvent);
  
  	if (result == TSS_SUCCESS) {
! 		if (lengthOnly == FALSE)
  			totalSize = get_pcr_event_size(pEvent);
! 		else
  			totalSize = 0;
  
  		*hdr = calloc(1, size + sizeof(UINT32) + totalSize);
***************
*** 3575,3579 ****
  		return TCSERR(TSS_E_INTERNAL_ERROR);
  
! 	rgbPublicInfo = (BYTE *) calloc(1, ulPublicInfoLength);
  	if (rgbPublicInfo == NULL) {
  		LogError("malloc of %d bytes failed.", ulPublicInfoLength);
--- 3545,3549 ----
  		return TCSERR(TSS_E_INTERNAL_ERROR);
  
! 	rgbPublicInfo = (BYTE *)calloc(1, ulPublicInfoLength);
  	if (rgbPublicInfo == NULL) {
  		LogError("malloc of %d bytes failed.", ulPublicInfoLength);
***************
*** 3712,3716 ****
  }
  
- 
  /* Dispatch */
  typedef struct tdDispatchTable {
--- 3682,3685 ----