added some new TCG IF-M message subtypes and attributes
authorAndreas Steffen <andreas.steffen@strongswan.org>
Sat, 2 Mar 2013 16:03:37 +0000 (17:03 +0100)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Sat, 2 Mar 2013 16:03:37 +0000 (17:03 +0100)
src/libpts/tcg/tcg_attr.c
src/libpts/tcg/tcg_attr.h
src/libtncif/tncif_pa_subtypes.c
src/libtncif/tncif_pa_subtypes.h

index 656791a..b91bf82 100644 (file)
 #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,
index b45e148..3c2d20b 100644 (file)
@@ -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,
index 135be3c..1936dff 100644 (file)
@@ -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);
index 2dc4c92..f0ed939 100644 (file)
@@ -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
 };