mark PCR registers as file type 2 in database

This commit is contained in:
Andreas Steffen
2011-11-28 21:23:59 +01:00
parent dac976296c
commit 8565db9356
2 changed files with 92 additions and 84 deletions
@@ -381,8 +381,8 @@ METHOD(attest_db_t, list_files, void,
private_attest_db_t *this)
{
enumerator_t *e;
char *file;
int fid, is_dir, meas, meta, count = 0;
char *file, *file_type[] = { " ", "d", "r" };
int fid, type, meas, meta, count = 0;
if (this->pid)
{
@@ -394,10 +394,11 @@ METHOD(attest_db_t, list_files, void,
DB_INT, this->pid, DB_INT, DB_INT, DB_TEXT, DB_INT, DB_INT);
if (e)
{
while (e->enumerate(e, &fid, &is_dir, &file, &meas, &meta))
while (e->enumerate(e, &fid, &type, &file, &meas, &meta))
{
type = (type < 0 || type > 2) ? 0 : type;
printf("%3d: |%s%s| %s %s\n", fid, meas ? "M":" ", meta ? "T":" ",
is_dir ? "d":" ", file);
file_type[type], file);
count++;
}
e->destroy(e);
@@ -411,9 +412,10 @@ METHOD(attest_db_t, list_files, void,
DB_INT, DB_INT, DB_TEXT);
if (e)
{
while (e->enumerate(e, &fid, &is_dir, &file))
while (e->enumerate(e, &fid, &type, &file))
{
printf("%3d: %s %s\n", fid, is_dir ? "d":" ", file);
type = (type < 0 || type > 2) ? 0 : type;
printf("%3d: %s %s\n", fid, file_type[type], file);
count++;
}
e->destroy(e);
+84 -78
View File
@@ -179,145 +179,145 @@ INSERT INTO files (
INSERT INTO files (
type, path
) VALUES (
0, 'pcr00'
2, 'pcr00'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr01'
2, 'pcr01'
);
INSERT INTO files ( /* 25 */
type, path
) VALUES (
0, 'pcr02'
2, 'pcr02'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr03'
2, 'pcr03'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr04'
2, 'pcr04'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr05'
2, 'pcr05'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr06'
2, 'pcr06'
);
INSERT INTO files ( /* 30 */
type, path
) VALUES (
0, 'pcr07'
2, 'pcr07'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr08'
2, 'pcr08'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr09'
2, 'pcr09'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr10'
2, 'pcr10'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr11'
2, 'pcr11'
);
INSERT INTO files ( /* 35 */
type, path
) VALUES (
0, 'pcr12'
2, 'pcr12'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr13'
2, 'pcr13'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr14'
2, 'pcr14'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr15'
2, 'pcr15'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr16'
2, 'pcr16'
);
INSERT INTO files ( /* 40 */
type, path
) VALUES (
0, 'pcr17'
2, 'pcr17'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr18'
2, 'pcr18'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr19'
2, 'pcr19'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr20'
2, 'pcr20'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr21'
2, 'pcr21'
);
INSERT INTO files ( /* 45 */
type, path
) VALUES (
0, 'pcr22'
2, 'pcr22'
);
INSERT INTO files (
type, path
) VALUES (
0, 'pcr23'
2, 'pcr23'
);
/* Components */
@@ -334,6 +334,12 @@ INSERT INTO components (
36906, 2, 33 /* ITA TBOOT */
);
INSERT INTO components (
vendor_id, name, qualifier
) VALUES (
36906, 3, 33 /* ITA IMA */
);
/* Product-File */
INSERT INTO product_file (
@@ -1433,72 +1439,72 @@ INSERT INTO file_hashes (
20, 7, 7, 8192, X'84200bd318bb022915150842ddf4002e061ef593604ad0d07021dc662cc40bfa749cce084ddf25d0e5137f6380f613d8'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
23, 7, 3, 32768, X'284ae59c737c4d1ddf785374cbb59a4c8d635590'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
24, 7, 3, 32768, X'311087044256d9c3a0b570ba3124cbb4d46f1197'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
25, 7, 3, 32768, X'b1f1f675427640aaa77bef93f26a333f0d57c9c5'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
26, 7, 3, 32768, X'b2a83b0ebf2f8374299a5b2bdfc31ea955ad7236'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
27, 7, 3, 32768, X'781c3cee5c3468a09f5ebee8e7d534acea0d2513'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
28, 7, 3, 32768, X'fec194a9d8f3af2b3876d4bfbbebf980e87e36e9'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
29, 7, 3, 32768, X'ee1b0f997d7517b286bc9d73a4cf742c65a769be'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
30, 7, 3, 32768, X'b2a83b0ebf2f8374299a5b2bdfc31ea955ad7236'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
40, 4, 2, 32768, X'9704353630674bfe21b86b64a7b0f99c297cf902'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
41, 4, 2, 32768, X'8397d8048ee36d7955e38da16fc33e86ef61d6b0'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
23, 7, 2, 32768, X'284ae59c737c4d1ddf785374cbb59a4c8d635590'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
24, 7, 2, 32768, X'311087044256d9c3a0b570ba3124cbb4d46f1197'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
25, 7, 2, 32768, X'b1f1f675427640aaa77bef93f26a333f0d57c9c5'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
26, 7, 2, 32768, X'b2a83b0ebf2f8374299a5b2bdfc31ea955ad7236'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
27, 7, 2, 32768, X'781c3cee5c3468a09f5ebee8e7d534acea0d2513'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
28, 7, 2, 32768, X'fec194a9d8f3af2b3876d4bfbbebf980e87e36e9'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
29, 7, 2, 32768, X'ee1b0f997d7517b286bc9d73a4cf742c65a769be'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
30, 7, 2, 32768, X'b2a83b0ebf2f8374299a5b2bdfc31ea955ad7236'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
40, 7, 2, 32768, X'd537d437f058136eb3d7be517dbe7647b623c619'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (
41, 4, 2, 32768, X'8397d8048ee36d7955e38da16fc33e86ef61d6b0'
);
INSERT INTO file_hashes (
file, product, component, algo, hash
) VALUES (