renamed pts_req_func_comp_evid flags

src/libimcv/plugins/imc_attestation/imc_attestation_process.c

@@ -340,14 +340,14 @@ bool imc_attestation_process(pa_tnc_attr_t *attr, linked_list_t *attr_list,
 				name->log(name, "* ");
 				negotiated_caps = pts->get_proto_caps(pts);
 
-				if (flags & PTS_REQ_FUNC_COMP_FLAG_TTC)
+				if (flags & PTS_REQ_FUNC_COMP_EVID_TTC)
 				{
 					attr = ietf_attr_pa_tnc_error_create(PEN_TCG,
 											TCG_PTS_UNABLE_DET_TTC, attr_info);
 					attr_list->insert_last(attr_list, attr);
 					break;
 				}
-				if (flags & PTS_REQ_FUNC_COMP_FLAG_VER &&
+				if (flags & PTS_REQ_FUNC_COMP_EVID_VER &&
 					!(negotiated_caps & PTS_PROTO_CAPS_V))
 				{
 					attr = ietf_attr_pa_tnc_error_create(PEN_TCG,
@@ -355,7 +355,7 @@ bool imc_attestation_process(pa_tnc_attr_t *attr, linked_list_t *attr_list,
 					attr_list->insert_last(attr_list, attr);
 					break;
 				}
-				if (flags & PTS_REQ_FUNC_COMP_FLAG_CURR &&
+				if (flags & PTS_REQ_FUNC_COMP_EVID_CURR &&
 					!(negotiated_caps & PTS_PROTO_CAPS_C))
 				{
 					attr = ietf_attr_pa_tnc_error_create(PEN_TCG,
@@ -363,7 +363,7 @@ bool imc_attestation_process(pa_tnc_attr_t *attr, linked_list_t *attr_list,
 					attr_list->insert_last(attr_list, attr);
 					break;
 				}
-				if (flags & PTS_REQ_FUNC_COMP_FLAG_PCR &&
+				if (flags & PTS_REQ_FUNC_COMP_EVID_PCR &&
 					!(negotiated_caps & PTS_PROTO_CAPS_T))
 				{
 					attr = ietf_attr_pa_tnc_error_create(PEN_TCG,

src/libpts/Makefile.am

@@ -10,7 +10,7 @@ libpts_la_SOURCES = \
 	pts/pts.h pts/pts.c \
 	pts/pts_error.h pts/pts_error.c \
 	pts/pts_proto_caps.h \
-	pts/pts_func_comp_evid_req.h \
+	pts/pts_req_func_comp_evid.h \
 	pts/pts_creds.h pts/pts_creds.c \
 	pts/pts_database.h pts/pts_database.c \
 	pts/pts_dh_group.h pts/pts_dh_group.c \

src/libpts/pts/components/ita/ita_comp_tboot.c

@@ -61,7 +61,7 @@ METHOD(pts_component_t, get_comp_func_name, pts_comp_func_name_t*,
 METHOD(pts_component_t, get_evidence_flags, u_int8_t,
 	pts_ita_comp_tboot_t *this)
 {
-	return PTS_REQ_FUNC_COMP_FLAG_PCR;
+	return PTS_REQ_FUNC_COMP_EVID_PCR;
 }
 
 METHOD(pts_component_t, measure, status_t,

src/libpts/pts/components/ita/ita_comp_tgrub.c

@@ -50,7 +50,7 @@ METHOD(pts_component_t, get_comp_func_name, pts_comp_func_name_t*,
 METHOD(pts_component_t, get_evidence_flags, u_int8_t,
 	pts_ita_comp_tgrub_t *this)
 {
-	return PTS_REQ_FUNC_COMP_FLAG_PCR;
+	return PTS_REQ_FUNC_COMP_EVID_PCR;
 }
 
 METHOD(pts_component_t, measure, status_t,

src/libpts/pts/pts.h

@@ -29,7 +29,7 @@ typedef struct pts_t pts_t;
 #include "pts_file_meas.h"
 #include "pts_file_meta.h"
 #include "pts_dh_group.h"
-#include "pts_func_comp_evid_req.h"
+#include "pts_req_func_comp_evid.h"
 #include "components/pts_comp_func_name.h"
 #include "components/tcg/tcg_comp_func_name.h"
 #include "components/ita/ita_comp_func_name.h"

src/libpts/pts/pts_req_func_comp_evid.h

@@ -14,29 +14,29 @@
  */
 
 /**
- * @defgroup pts_func_comp_evid_req pts_func_comp_evid_req
+ * @defgroup pts_req_func_comp_evid pts_req_func_comp_evid
  * @{ @ingroup pts
  */
 
-#ifndef PTS_FUNC_COMP_EVID_REQ_H_
+#ifndef PTS_REQ_FUNC_COMP_EVID_H_
-#define PTS_FUNC_COMP_EVID_REQ_H_
+#define PTS_REQ_FUNC_COMP_EVID_H_
 
-typedef enum pts_attr_req_func_comp_evid_flag_t pts_attr_req_func_comp_evid_flag_t;
+typedef enum pts_req_func_comp_evid_t pts_req_func_comp_evid_t;
 
 #include <library.h>
 
 /**
  * PTS Request Functional Component Evidence Flags
  */
-enum pts_attr_req_funct_comp_evid_flag_t {
+enum pts_req_func_comp_evid_t {
 	/** Transitive Trust Chain flag */
-	PTS_REQ_FUNC_COMP_FLAG_TTC =				(1<<7),
+	PTS_REQ_FUNC_COMP_EVID_TTC =			(1<<7),
 	/** Verify Component flag */
-	PTS_REQ_FUNC_COMP_FLAG_VER =				(1<<6),
+	PTS_REQ_FUNC_COMP_EVID_VER =			(1<<6),
 	/** Current Evidence flag */
-	PTS_REQ_FUNC_COMP_FLAG_CURR =				(1<<5),
+	PTS_REQ_FUNC_COMP_EVID_CURR =			(1<<5),
 	/** PCR Information flag */
-	PTS_REQ_FUNC_COMP_FLAG_PCR =				(1<<4),
+	PTS_REQ_FUNC_COMP_EVID_PCR =			(1<<4),
 };
 
 #endif /** PTS_FUNCT_COMP_EVID_REQ_H_ @}*/