Index: tcs_evlog_imaem.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/tcs/tcs_evlog_imaem.c,v
retrieving revision 1.7
diff -u -r1.7 tcs_evlog_imaem.c
--- tcs_evlog_imaem.c	21 Jan 2010 21:29:53 -0000	1.7
+++ tcs_evlog_imaem.c	13 Feb 2010 23:29:36 -0000
@@ -84,7 +84,7 @@
 	struct event_wrapper *cur = list;
 	TSS_RESULT result = TCSERR(TSS_E_INTERNAL_ERROR);
 	FILE *fp = (FILE *) handle;
-	uint len;
+	UINT32 len;
 	char name[255];
 
 	if (list == NULL) {
@@ -106,7 +106,7 @@
         while (fread(page, 24, 1, fp)) {
 		/* copy the initial 4 bytes (PCR index) XXX endianess ignored */
 		ptr = 0;
-		memcpy(&pcr_value, &page[ptr], sizeof(int));
+		memcpy(&pcr_value, &page[ptr], sizeof(UINT32));
 		cur->event.ulPcrIndex = pcr_value;
 		ptr += sizeof(int);
 
@@ -127,27 +127,27 @@
 {
 		char digest[20];
 
-		if (fread(&len, sizeof(len), 1, fp) != (sizeof(len))) {
-			LogError("Failed to read event log file");
+		if (fread(&len, sizeof(len), 1, fp) != 1) {
+			LogError("Failed to read event log file (len)");
 			result = TCSERR(TSS_E_INTERNAL_ERROR);
 			goto free_list;
 		}
 		
 		memset(name, 0, sizeof name);
-		if (fread(name, len, 1, fp) != len) {
-			LogError("Failed to read event log file");
+		if (fread(name, len, 1, fp) != 1) {
+			LogError("Failed to read event log file (name)");
 			result = TCSERR(TSS_E_INTERNAL_ERROR);
 			goto free_list;
 		}
-		if (fread(digest, sizeof digest, 1, fp) != (sizeof(digest))) {
-			LogError("Failed to read event log file");
+		if (fread(digest, sizeof digest, 1, fp) != 1) {
+			LogError("Failed to read event log file (digest)");
 			result = TCSERR(TSS_E_INTERNAL_ERROR);
 			goto free_list;
 		}
 }
 		/* Get the template data namelen and data */
-		if (fread(&cur->event.ulEventLength, sizeof(int), 1, fp) != sizeof(int)) {
-			LogError("Failed to read event log file");
+		if (fread(&cur->event.ulEventLength, sizeof(UINT32), 1, fp) != 1) {
+			LogError("Failed to read event log file (tempate len)");
 			result = TCSERR(TSS_E_INTERNAL_ERROR);
 			goto free_list;
 		}
@@ -160,9 +160,9 @@
 			goto free_list;
 		}
 		memset(cur->event.rgbEvent, 0, cur->event.ulEventLength);
-		if (fread(cur->event.rgbEvent, cur->event.ulEventLength, 1, fp) != cur->event.ulEventLength) {
+		if (fread(cur->event.rgbEvent, cur->event.ulEventLength, 1, fp) != 1) {
 			free(cur->event.rgbPcrValue);
-			LogError("Failed to read event log file");
+			LogError("Failed to read event log file (template)");
 			result = TCSERR(TSS_E_INTERNAL_ERROR);
 			goto free_list;
 		}
@@ -226,7 +226,7 @@
 ima_get_entry(FILE *handle, UINT32 pcr_index, UINT32 *num, TSS_PCR_EVENT **ppEvent)
 {
 	int pcr_value, ptr = 0;
-	uint len;
+	UINT32 len;
 	char page[IMA_READ_SIZE];
 	UINT32 seen_indices = 0;
 	TSS_RESULT result = TCSERR(TSS_E_INTERNAL_ERROR);
@@ -238,12 +238,12 @@
 	while (fread(page, 24, 1, fp)) {
 		/* copy the initial 4 bytes (PCR index) XXX endianess ignored */
 		ptr = 0;
-		memcpy(&pcr_value, &page[ptr], sizeof(int));
+		memcpy(&pcr_value, &page[ptr], sizeof(UINT32));
 
 		if (pcr_index == (UINT32)pcr_value) {
 			event = calloc(1, sizeof(TSS_PCR_EVENT));
 			event->ulPcrIndex = pcr_value;
-			ptr += sizeof(int);
+			ptr += sizeof(UINT32);
 			/* This is the case where we're looking for a specific event number in a
 			 * specific PCR index. When we've reached the correct event, malloc
 			 * space for it, copy it in, then break out of the while loop */
@@ -266,20 +266,20 @@
 				{
 					char digest[20];
 
-					if (fread(&len, sizeof(len), 1, fp) != sizeof(len)) {
+					if (fread(&len, sizeof(len), 1, fp) != 1) {
 						free(event);
 						LogError("Failed to read event log file");
 						result = TCSERR(TSS_E_INTERNAL_ERROR);
 						goto done;
 					}
 					memset(name, 0, sizeof name);
-					if (fread(name, len, 1, fp) != len) {
+					if (fread(name, len, 1, fp) != 1) {
 						free(event);
 						LogError("Failed to read event log file");
 						result = TCSERR(TSS_E_INTERNAL_ERROR);
 						goto done;
 					}
-					if (fread(digest, sizeof(digest), 1, fp) != sizeof(digest)) {
+					if (fread(digest, sizeof(digest), 1, fp) != 1) {
 						free(event);
 						LogError("Failed to read event log file");
 						result = TCSERR(TSS_E_INTERNAL_ERROR);
@@ -287,7 +287,7 @@
 					}
 				}
 				/* Get the template data namelen and data */
-				if (fread(&event->ulEventLength, sizeof(int), 1, fp) != sizeof(int)) {
+				if (fread(&event->ulEventLength, sizeof(int), 1, fp) != 1) {
 					free(event);
 					LogError("Failed to read event log file");
 					result = TCSERR(TSS_E_INTERNAL_ERROR);
@@ -303,7 +303,7 @@
 					goto done;
 				}
 				memset(event->rgbEvent, 0, event->ulEventLength);
-				if (fread(event->rgbEvent, event->ulEventLength, 1, fp) != event->ulEventLength ) {
+				if (fread(event->rgbEvent, event->ulEventLength, 1, fp) != 1 ) {
 					free(event->rgbPcrValue);
 					free(event);
 					LogError("Failed to read event log file");
@@ -316,7 +316,7 @@
 				break;
 			}
 		}
-		if (fread(&len, sizeof(len), 1, fp) != sizeof(len)) {
+		if (fread(&len, sizeof(len), 1, fp) != 1) {
 			free(event->rgbPcrValue);
 			free(event);
 			LogError("Failed to read event log file");
@@ -324,7 +324,7 @@
 			goto done;
 		}
 		fseek(fp, len + 20, SEEK_CUR);
-		if (fread(&len, sizeof(len), 1, fp) != sizeof(len)) {
+		if (fread(&len, sizeof(len), 1, fp) != 1) {
 			free(event->rgbPcrValue);
 			free(event);
 			LogError("Failed to read event log file");