denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed measurement rollback

Browse Source
This commit is contained in:
Andreas Steffen
2011-11-28 21:24:00 +01:00
parent db08702326
commit 64d4be9b86
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libpts/pts/components/ita/ita_comp_ima.c
+7 -1
View File
@@ -369,6 +369,8 @@ METHOD(pts_component_t, destroy, void,
pts_ita_comp_ima_t *this)
{
int i, count;
u_int32_t vid, name;
enum_name_t *names;
for (i = 0; i < IMA_PCR_MAX; i++)
{
@@ -378,7 +380,11 @@ METHOD(pts_component_t, destroy, void,
{
count = this->pts_db->delete_comp_measurements(this->pts_db, this->name,
this->keyid);
DBG1(DBG_PTS, " deleted %d measurements", count);
vid = this->name->get_vendor_id(this->name);
name = this->name->get_name(this->name);
names = pts_components->get_comp_func_names(pts_components, vid);
DBG1(DBG_PTS, "deleted %d registered %N '%N' functional component "
"evidence measurements", count, pen_names, vid, names, name);
}
this->list->destroy_function(this->list, (void *)free_entry);
this->name->destroy(this->name);
src/libpts/pts/components/ita/ita_comp_tboot.c
+7 -1
View File
@@ -272,12 +272,18 @@ METHOD(pts_component_t, destroy, void,
pts_ita_comp_tboot_t *this)
{
int count;
u_int32_t vid, name;
enum_name_t *names;
if (this->is_registering)
{
count = this->pts_db->delete_comp_measurements(this->pts_db, this->name,
this->keyid);
DBG1(DBG_PTS, " deleted %d measurements", count);
vid = this->name->get_vendor_id(this->name);
name = this->name->get_name(this->name);
names = pts_components->get_comp_func_names(pts_components, vid);
DBG1(DBG_PTS, "deleted %d registered %N '%N' functional component "
"evidence measurements", count, pen_names, vid, names, name);
}
this->name->destroy(this->name);
free(this->keyid.ptr);
src/libpts/pts/pts_database.c
+1 -1
View File
@@ -200,7 +200,7 @@ METHOD(pts_database_t, delete_comp_measurements, int,
"DELETE FROM component_hashes WHERE "
"component = (SELECT id FROM components"
" WHERE vendor_id = ? AND name = ? AND qualifier = ?) AND "
"key = (SELECT id FROM keys WHERE keyid = ?))",
"key = (SELECT id FROM keys WHERE keyid = ?)",
DB_INT, comp_name->get_vendor_id(comp_name),
DB_INT, comp_name->get_name(comp_name),
DB_INT, comp_name->get_qualifier(comp_name),