ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

renamed pts_req_func_comp_evid flags

This commit is contained in:
Andreas Steffen 2011-11-22 18:21:07 +01:00
parent 4e84b5b033
commit 8d851141b7
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libimcv/plugins/imc_attestation/imc_attestation_process.c
View File

@ -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,

2
src/libpts/Makefile.am
View File

@ -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 \

2
src/libpts/pts/components/ita/ita_comp_tboot.c
View File

@ -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,

2
src/libpts/pts/components/ita/ita_comp_tgrub.c
View File

@ -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,

2
src/libpts/pts/pts.h
View File

@ -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"

18
src/libpts/pts/pts_func_comp_evid_req.h → src/libpts/pts/pts_req_func_comp_evid.h
View File

@ -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_
#define PTS_FUNC_COMP_EVID_REQ_H_
#ifndef PTS_REQ_FUNC_COMP_EVID_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_ @}*/