added some new TCG IF-M message subtypes and attributes

diff --git a/src/libpts/tcg/tcg_attr.c b/src/libpts/tcg/tcg_attr.c
index 656791a8fbfb618f4e8ebea2fc713f44b629a2bc..b91bf8283cf759bc80a0d3b888595a792906ad80 100644 (file)
--- a/src/libpts/tcg/tcg_attr.c
+++ b/src/libpts/tcg/tcg_attr.c
@@ -31,8 +31,23 @@
 #include "tcg/tcg_pts_attr_req_file_meta.h"
 #include "tcg/tcg_pts_attr_unix_file_meta.h"
 
-ENUM_BEGIN(tcg_attr_names,     TCG_PTS_REQ_FUNC_COMP_EVID,
+ENUM_BEGIN(tcg_attr_names,     TCG_SCAP_REFERENCES,
+                                                       TCG_SCAP_SUMMARY_RESULTS,
+       "SCAP References",
+       "SCAP Capabilities and Inventory",
+       "SCAP Content",
+       "SCAP Assessment",
+       "SCAP Results",
+       "SCAP Summary Results");
+ENUM_NEXT(tcg_attr_names,      TCG_SWID_INVENTORY_REQUEST,
+                                                       TCG_SWID_TAG_IDENTIFIER_RESPONSE,
+                                                       TCG_SCAP_SUMMARY_RESULTS,
+       "SWID Inventory Request",
+       "SWID Tag Response",
+       "SWID Tag Identifier Response");
+ENUM_NEXT(tcg_attr_names,      TCG_PTS_REQ_FUNC_COMP_EVID,
                                                        TCG_PTS_REQ_FUNC_COMP_EVID,
+                                                       TCG_SWID_TAG_IDENTIFIER_RESPONSE,
        "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 b45e1488f100485f2a47d64315ba3e5261acd4f3..3c2d20bbaaaddbee603b399249ad3dd8a4082ccb 100644 (file)
--- a/src/libpts/tcg/tcg_attr.h
+++ b/src/libpts/tcg/tcg_attr.h
@@ -31,6 +31,19 @@ typedef enum tcg_attr_t tcg_attr_t;
  */
 enum tcg_attr_t {
 
+       /* SCAP Messages */
+       TCG_SCAP_REFERENCES =                 0x00000001,
+       TCG_SCAP_CAPS_AND_INVENTORY =         0x00000002,
+       TCG_SCAP_CONTENT =                    0x00000003,
+       TCG_SCAP_ASSESSMENT =                 0x00000004,
+       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,
+
        /* PTS Protocol Negotiations */
        TCG_PTS_REQ_PROTO_CAPS =              0x01000000,
        TCG_PTS_PROTO_CAPS =                  0x02000000,

diff --git a/src/libtncif/tncif_pa_subtypes.c b/src/libtncif/tncif_pa_subtypes.c
index 135be3c314e45a54d27263a1b09e4f19aa3374ab..1936dff1f890306759ceee201cdedcce4f639b69 100644 (file)
--- a/src/libtncif/tncif_pa_subtypes.c
+++ b/src/libtncif/tncif_pa_subtypes.c
@@ -33,11 +33,13 @@ ENUM_NEXT(pa_subtype_ietf_names, PA_SUBTYPE_IETF_ANY, PA_SUBTYPE_IETF_ANY,
 );
 ENUM_END(pa_subtype_ietf_names, PA_SUBTYPE_IETF_ANY);
 
-ENUM_BEGIN(pa_subtype_tcg_names, PA_SUBTYPE_TCG_PTS, PA_SUBTYPE_TCG_PTS,
-       "PTS"
+ENUM_BEGIN(pa_subtype_tcg_names, PA_SUBTYPE_TCG_PTS, PA_SUBTYPE_TCG_SWID,
+       "PTS",
+       "SCAP",
+       "SWID"
 );
 ENUM_NEXT(pa_subtype_tcg_names, PA_SUBTYPE_TCG_ANY, PA_SUBTYPE_TCG_ANY,
-                                                               PA_SUBTYPE_TCG_PTS,
+                                                               PA_SUBTYPE_TCG_SWID,
        "ANY"
 );
 ENUM_END(pa_subtype_tcg_names, PA_SUBTYPE_TCG_ANY);

diff --git a/src/libtncif/tncif_pa_subtypes.h b/src/libtncif/tncif_pa_subtypes.h
index 2dc4c922024e4cc3020c848b2eb7dec2b41eac5d..f0ed939038065df89af0a1dee203246e0b43c420 100644 (file)
--- a/src/libtncif/tncif_pa_subtypes.h
+++ b/src/libtncif/tncif_pa_subtypes.h
@@ -54,6 +54,8 @@ extern enum_name_t *pa_subtype_ietf_names;
  */
  enum pa_subtype_tcg_t {
        PA_SUBTYPE_TCG_PTS =                            0x01,
+       PA_SUBTYPE_TCG_SCAP =                           0x02,
+       PA_SUBTYPE_TCG_SWID =                           0x03,
        PA_SUBTYPE_TCG_ANY =                            0xff
 };