diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2012-07-23 22:19:20 +0200 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2012-07-23 22:19:30 +0200 |
| commit | 15f78beb0fbfde6c83b9446e5a1f001ce510e512 (patch) | |
| tree | df2b97646f4daebd3b1ac0253f77d7126d6e7cdd /src/libpts | |
| parent | 327dcf96db6a6a93770d989d66ecc7a6ddedaaee (diff) | |
| download | strongswan-15f78beb0fbfde6c83b9446e5a1f001ce510e512.tar.bz2 strongswan-15f78beb0fbfde6c83b9446e5a1f001ce510e512.tar.xz | |
IMA SHA1 file measurement is not needed any more
Diffstat (limited to 'src/libpts')
| -rw-r--r-- | src/libpts/pts/components/ita/ita_comp_ima.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/libpts/pts/components/ita/ita_comp_ima.c b/src/libpts/pts/components/ita/ita_comp_ima.c index b1a8b861a..8fbf6c09d 100644 --- a/src/libpts/pts/components/ita/ita_comp_ima.c +++ b/src/libpts/pts/components/ita/ita_comp_ima.c @@ -184,11 +184,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 */ char *filename; @@ -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); |