Moved structures related to File Measurement to pts.h

diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation.c b/src/libimcv/plugins/imv_attestation/imv_attestation.c
index 9b46214..118fbb8 100644 (file)
--- a/src/libimcv/plugins/imv_attestation/imv_attestation.c
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation.c
@@ -77,17 +77,6 @@ static linked_list_t *file_list, *directory_list;
  */
 static u_int16_t request_id_counter = 0;
 
-/* TODO: Move the struct to some header file? Duplicate with imc_attestation*/
-/**
- * Struct to hold file or directory name with the request ID for Request File Measurement attribute
- */
-typedef struct measurement_req_entry_t measurement_req_entry_t;
-
-struct measurement_req_entry_t {
-       char *path;
-       u_int16_t request_id;
-};
-
 /**
  * see section 3.7.1 of TCG TNC IF-IMV Specification 1.2
  */

diff --git a/src/libimcv/tcg/tcg_pts_attr_file_meas.h b/src/libimcv/tcg/tcg_pts_attr_file_meas.h
index 95ecfdc..2bb892b 100644 (file)
--- a/src/libimcv/tcg/tcg_pts_attr_file_meas.h
+++ b/src/libimcv/tcg/tcg_pts_attr_file_meas.h
@@ -25,17 +25,8 @@ typedef struct tcg_pts_attr_file_meas_t tcg_pts_attr_file_meas_t;
 
 #include "tcg_attr.h"
 #include "pa_tnc/pa_tnc_attr.h"
-
-typedef struct file_meas_entry_t file_meas_entry_t;
-
-/**
- * File Measurement entry
- */
-struct file_meas_entry_t {
-       chunk_t   measurement;
-       u_int16_t file_name_len;
-       chunk_t   file_name;
-};
+/* TODO: for struct file_meas_entry_t */
+#include "pts/pts.h"
 
 /**
  * Class implementing the TCG PTS File Measurement attribute