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

decoupled request ID from files table primary key

Browse Source
This commit is contained in:
Andreas Steffen
2011-09-10 22:39:56 +02:00
parent cfedfcca31
commit f4ef026762
3 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libimcv/plugins/imv_attestation/imv_attestation.c
+8 -6
View File
@@ -233,6 +233,7 @@ static TNC_Result send_message(TNC_ConnectionID connection_id)
enumerator_t *enumerator;
u_int32_t delimiter = SOLIDUS_UTF;
char *platform_info, *pathname;
u_int16_t request_id;
int id, type;
bool is_dir;
@@ -277,11 +278,12 @@ static TNC_Result send_message(TNC_ConnectionID connection_id)
is_dir = (type != 0);
DBG2(DBG_IMV, "measurement request %d for %s '%s'",
id, is_dir ? "directory" : "file", pathname);
attr = tcg_pts_attr_req_file_meas_create(is_dir, id, delimiter,
pathname);
request_id = attestation_state->add_request(attestation_state,
id, is_dir);
attr = tcg_pts_attr_req_file_meas_create(is_dir, request_id,
delimiter, pathname);
attr->set_noskip_flag(attr, TRUE);
msg->add_attribute(msg, attr);
attestation_state->add_request(attestation_state, id , is_dir);
}
enumerator->destroy(enumerator);
break;
@@ -486,7 +488,7 @@ TNC_Result TNC_IMV_ReceiveMessage(TNC_IMVID imv_id,
{
tcg_pts_attr_file_meas_t *attr_cast;
u_int16_t request_id;
int file_count;
int file_count, file_id;
pts_meas_algorithms_t algo;
pts_file_meas_t *measurements;
char *platform_info;
@@ -509,7 +511,7 @@ TNC_Result TNC_IMV_ReceiveMessage(TNC_IMVID imv_id,
request_id, file_count, (file_count == 1) ? "":"s");
if (!attestation_state->check_off_request(attestation_state,
request_id, &is_dir))
request_id, &file_id, &is_dir))
{
DBG1(DBG_IMV, " no entry found for this request");
break;
@@ -517,7 +519,7 @@ TNC_Result TNC_IMV_ReceiveMessage(TNC_IMVID imv_id,
/* check hashes from database against measurements */
e_hash = pts_db->create_hash_enumerator(pts_db,
platform_info, algo, request_id, is_dir);
platform_info, algo, file_id, is_dir);
if (!measurements->verify(measurements, e_hash, is_dir))
{
measurement_error = TRUE;