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

cosmetics in debug output

Browse Source
This commit is contained in:
Andreas Steffen
2011-11-28 21:23:24 +01:00
parent 424d1cbfb0
commit 75d7315646
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libpts/pts/components/ita/ita_comp_tboot.c
+10 -11
View File
@@ -151,11 +151,9 @@ METHOD(pts_component_t, verify, status_t,
pts_meas_algorithms_t algo; pts_meas_algorithms_t algo;
pts_pcr_transform_t transform; pts_pcr_transform_t transform;
time_t measurement_time; time_t measurement_time;
chunk_t measurement, pcr_before, pcr_after; chunk_t measurement, pcr_before, pcr_after, hash;
enumerator_t *enumerator; enumerator_t *enumerator;
char *file; char *file, *platform_info;
chunk_t hash;
char *platform_info;
platform_info = pts->get_platform_info(pts); platform_info = pts->get_platform_info(pts);
if (!pts_db || !platform_info) if (!pts_db || !platform_info)
@@ -193,8 +191,8 @@ METHOD(pts_component_t, verify, status_t,
platform_info, this->name, TRUSTED_HASH_ALGO); platform_info, this->name, TRUSTED_HASH_ALGO);
if (!enumerator->enumerate(enumerator, &hash)) if (!enumerator->enumerate(enumerator, &hash))
{ {
DBG1(DBG_PTS, "No Measurement found in database for component:%s ," DBG1(DBG_PTS, "no measurement found in database for component:%s "
" on platform: %s with hashing algorithm: %N", "for platform: %s with hash algorithm %N",
file, platform_info, pts_meas_algorithm_names, TRUSTED_HASH_ALGO); file, platform_info, pts_meas_algorithm_names, TRUSTED_HASH_ALGO);
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
@@ -205,15 +203,16 @@ METHOD(pts_component_t, verify, status_t,
{ {
if (!chunk_equals(hash, measurement)) if (!chunk_equals(hash, measurement))
{ {
DBG1(DBG_PTS, "Incorrect TBOOT component measurement for PCR %d. " DBG1(DBG_PTS, "PCR %2d: no matching TBOOT component measurement "
"Expected: %#B, Received: %#B", "found in database", this->extended_pcr);
this->extended_pcr, &hash, &measurement); DBG1(DBG_PTS, " expected: %#B", &hash);
DBG1(DBG_PTS, " received: %#B", &measurement);
return FAILED; return FAILED;
} }
else else
{ {
DBG3(DBG_PTS, "Matching TBOOT component measurement for PCR %d", DBG2(DBG_PTS, "PCR %2d: matching TBOOT component measurement "
this->extended_pcr); "found in database", this->extended_pcr);
break; break;
} }
} }