From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Mon, 23 Jul 2012 20:19:20 +0000 (+0200)
Subject: IMA SHA1 file measurement is not needed any more
X-Git-Tag: 5.0.1~256
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15f78beb0fbfde6c83b9446e5a1f001ce510e512;p=thirdparty%2Fstrongswan.git

IMA SHA1 file measurement is not needed any more
---

diff --git a/src/libpts/pts/components/ita/ita_comp_ima.c b/src/libpts/pts/components/ita/ita_comp_ima.c
index b1a8b861a4..8fbf6c09dd 100644
--- a/src/libpts/pts/components/ita/ita_comp_ima.c
+++ b/src/libpts/pts/components/ita/ita_comp_ima.c
@@ -183,11 +183,6 @@ struct ima_entry_t {
 	 */
 	chunk_t measurement;
 
-	/**
-	 * SHA1 file measurement thash
-	 */
-	chunk_t file_measurement;
-
 	/**
 	 * absolute path of executable files or basename of dynamic libraries
 	 */
@@ -209,7 +204,6 @@ static void free_bios_entry(bios_entry_t *this)
 static void free_ima_entry(ima_entry_t *this)
 {
 	free(this->measurement.ptr);
-	free(this->file_measurement.ptr);
 	free(this->filename);
 	free(this);
 }
@@ -329,7 +323,6 @@ static bool load_runtime_measurements(char *file, linked_list_t *list,
 
 		entry = malloc_thing(ima_entry_t);
 		entry->measurement = chunk_alloc(HASH_SIZE_SHA1);
-		entry->file_measurement = chunk_alloc(HASH_SIZE_SHA1);
 		entry->filename = NULL;
 
 		if (res != 4 || pcr != IMA_PCR)
@@ -349,7 +342,7 @@ static bool load_runtime_measurements(char *file, linked_list_t *list,
 		{
 			break;
 		}
-		if (read(fd, entry->file_measurement.ptr, HASH_SIZE_SHA1) != HASH_SIZE_SHA1)
+		if (lseek(fd, HASH_SIZE_SHA1, SEEK_CUR) == -1)
 		{
 			break;
 		}
@@ -543,7 +536,6 @@ METHOD(pts_component_t, measure, status_t,
 				evid->set_validation(evid, PTS_COMP_EVID_VALIDATION_PASSED,
 										   ima_entry->filename);
 			}
-			free(ima_entry->file_measurement.ptr);
 			free(ima_entry->filename);
 			free(ima_entry);