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

component_hashes new table added

Browse Source 
measurements added for tboot component
create_comp_hash_enumerator modified accordingly
This commit is contained in:
Sansar Choinyambuu
2011-11-28 21:20:23 +01:00
committed by Andreas Steffen
parent 40cfe6db6a
commit 0975b00d06
5 changed files with 50 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libimcv/plugins/imv_attestation/data.sql
+20 -102
View File
@@ -176,18 +176,6 @@ INSERT INTO files (
0, '/etc/tnc_config', 1
);
INSERT INTO files (
type, path
) VALUES (
0, 'tboot_pcr17'
);
INSERT INTO files (
type, path
) VALUES (
0, 'tboot_pcr18'
);
/* Components */
INSERT INTO components (
@@ -240,18 +228,6 @@ INSERT INTO product_file (
1, 22
);
INSERT INTO product_file (
product, file
) VALUES (
1, 23
);
INSERT INTO product_file (
product, file
) VALUES (
1, 24
);
INSERT INTO product_file (
product, file
) VALUES (
@@ -282,18 +258,6 @@ INSERT INTO product_file (
2, 22
);
INSERT INTO product_file (
product, file
) VALUES (
2, 23
);
INSERT INTO product_file (
product, file
) VALUES (
2, 24
);
INSERT INTO product_file (
product, file
) VALUES (
@@ -312,18 +276,6 @@ INSERT INTO product_file (
3, 22
);
INSERT INTO product_file (
product, file
) VALUES (
3, 23
);
INSERT INTO product_file (
product, file
) VALUES (
3, 24
);
INSERT INTO product_file (
product, file
) VALUES (
@@ -354,18 +306,6 @@ INSERT INTO product_file (
4, 22
);
INSERT INTO product_file (
product, file
) VALUES (
4, 23
);
INSERT INTO product_file (
product, file
) VALUES (
4, 24
);
INSERT INTO product_file (
product, file
) VALUES (
@@ -396,18 +336,6 @@ INSERT INTO product_file (
5, 22
);
INSERT INTO product_file (
product, file
) VALUES (
5, 23
);
INSERT INTO product_file (
product, file
) VALUES (
5, 24
);
INSERT INTO product_file (
product, file
) VALUES (
@@ -438,18 +366,6 @@ INSERT INTO product_file (
6, 22
);
INSERT INTO product_file (
product, file
) VALUES (
6, 23
);
INSERT INTO product_file (
product, file
) VALUES (
6, 24
);
INSERT INTO product_file (
product, file
) VALUES (
@@ -486,28 +402,30 @@ INSERT INTO product_file (
7, 22
);
INSERT INTO product_file (
product, file
) VALUES (
7, 23
);
/* Product Component */
INSERT INTO product_file (
product, file
INSERT INTO product_component (
product, component
) VALUES (
7, 24
4, 1
);
INSERT INTO product_component (
product, component, sequence
product, component
) VALUES (
7, 1, 1
4, 2
);
INSERT INTO product_component (
product, component, sequence
product, component
) VALUES (
7, 2, 2
7, 1
);
INSERT INTO product_component (
product, component
) VALUES (
7, 2
);
/* File Hashes */
@@ -1377,14 +1295,14 @@ INSERT INTO file_hashes (
20, 7, 7, 8192, X'84200bd318bb022915150842ddf4002e061ef593604ad0d07021dc662cc40bfa749cce084ddf25d0e5137f6380f613d8'
);
INSERT INTO file_hashes (
file, product, algo, hash
INSERT INTO component_hashes (
component, product, sequence, algo, hash
) VALUES (
23, 4, 32768, X'9704353630674bfe21b86b64a7b0f99c297cf902'
2, 4, 1, 32768, X'9704353630674bfe21b86b64a7b0f99c297cf902'
);
INSERT INTO file_hashes (
file, product, algo, hash
INSERT INTO component_hashes (
component, product, sequence, algo, hash
) VALUES (
24, 4, 32768, X'8397d8048ee36d7955e38da16fc33e86ef61d6b0'
2, 4, 2, 32768, X'8397d8048ee36d7955e38da16fc33e86ef61d6b0'
);
src/libimcv/plugins/imv_attestation/imv_attestation_process.c
+1 -1
View File
@@ -216,7 +216,7 @@ bool imv_attestation_process(pa_tnc_attr_t *attr, linked_list_t *attr_list,
}
/* check hashes from database against measurements */
e_hash = pts_db->create_hash_enumerator(pts_db,
e_hash = pts_db->create_file_hash_enumerator(pts_db,
platform_info, algo, file_id, is_dir);
if (!measurements->verify(measurements, e_hash, is_dir))
{
src/libimcv/plugins/imv_attestation/tables.sql
+11 -1
View File
@@ -39,7 +39,7 @@ CREATE TABLE product_component (
product INTEGER NOT NULL,
component INTEGER NOT NULL,
sequence INTEGER DEFAULT 0,
PRIMARY KEY (product, component)
PRIMARY KEY (product, component, sequence)
);
DROP TABLE IF EXISTS file_hashes;
@@ -52,3 +52,13 @@ CREATE TABLE file_hashes (
PRIMARY KEY(file, directory, product, algo)
);
DROP TABLE IF EXISTS component_hashes;
CREATE TABLE component_hashes (
component INTEGER NOT NULL,
product INTEGER NOT NULL,
sequence INTEGER DEFAULT 0,
algo INTEGER NOT NULL,
hash BLOB NOT NULL,
PRIMARY KEY(component, product, sequence, algo)
);