From 0bd29a438ec57178fb660b203c66d08289e6e0c9 Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Tue, 13 Aug 2013 22:04:49 +0200 Subject: [PATCH] Updated the SWID attributes --- src/libpts/tcg/tcg_attr.c | 14 ++++++++------ src/libpts/tcg/tcg_attr.h | 12 +++++++----- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/libpts/tcg/tcg_attr.c b/src/libpts/tcg/tcg_attr.c index b91bf82..2ce235e 100644 --- a/src/libpts/tcg/tcg_attr.c +++ b/src/libpts/tcg/tcg_attr.c @@ -39,15 +39,17 @@ ENUM_BEGIN(tcg_attr_names, TCG_SCAP_REFERENCES, "SCAP Assessment", "SCAP Results", "SCAP Summary Results"); -ENUM_NEXT(tcg_attr_names, TCG_SWID_INVENTORY_REQUEST, - TCG_SWID_TAG_IDENTIFIER_RESPONSE, +ENUM_NEXT(tcg_attr_names, TCG_SWID_REQUEST, + TCG_SWID_TAG_EVENTS, TCG_SCAP_SUMMARY_RESULTS, - "SWID Inventory Request", - "SWID Tag Response", - "SWID Tag Identifier Response"); + "SWID Request", + "SWID Tag Identifier Inventory", + "SWID Tag Identifier Events", + "SWID Tag Inventory", + "SWID Tag Events"); ENUM_NEXT(tcg_attr_names, TCG_PTS_REQ_FUNC_COMP_EVID, TCG_PTS_REQ_FUNC_COMP_EVID, - TCG_SWID_TAG_IDENTIFIER_RESPONSE, + TCG_SWID_TAG_EVENTS, "Request Functional Component Evidence"); ENUM_NEXT(tcg_attr_names, TCG_PTS_GEN_ATTEST_EVID, TCG_PTS_GEN_ATTEST_EVID, diff --git a/src/libpts/tcg/tcg_attr.h b/src/libpts/tcg/tcg_attr.h index ed6c976..085dae6 100644 --- a/src/libpts/tcg/tcg_attr.h +++ b/src/libpts/tcg/tcg_attr.h @@ -31,7 +31,7 @@ typedef enum tcg_attr_t tcg_attr_t; */ enum tcg_attr_t { - /* SCAP Messages */ + /* SCAP Attributes */ TCG_SCAP_REFERENCES = 0x00000001, TCG_SCAP_CAPS_AND_INVENTORY = 0x00000002, TCG_SCAP_CONTENT = 0x00000003, @@ -39,10 +39,12 @@ enum tcg_attr_t { TCG_SCAP_RESULTS = 0x00000005, TCG_SCAP_SUMMARY_RESULTS = 0x00000006, - /* SWID Messages */ - TCG_SWID_INVENTORY_REQUEST = 0x00000011, - TCG_SWID_TAG_RESPONSE = 0x00000012, - TCG_SWID_TAG_IDENTIFIER_RESPONSE = 0x00000013, + /* SWID Attributes */ + TCG_SWID_REQUEST = 0x00000011, + TCG_SWID_TAG_ID_INVENTORY = 0x00000012, + TCG_SWID_TAG_ID_EVENTS = 0x00000013, + TCG_SWID_TAG_INVENTORY = 0x00000014, + TCG_SWID_TAG_EVENTS = 0x00000015, /* PTS Protocol Negotiations */ TCG_PTS_REQ_PROTO_CAPS = 0x01000000, -- 2.7.4