renamed pts_req_func_comp_evid flags
authorAndreas Steffen <andreas.steffen@strongswan.org>
Tue, 22 Nov 2011 17:21:07 +0000 (18:21 +0100)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Mon, 28 Nov 2011 20:22:02 +0000 (21:22 +0100)
src/libimcv/plugins/imc_attestation/imc_attestation_process.c
src/libpts/Makefile.am
src/libpts/pts/components/ita/ita_comp_tboot.c
src/libpts/pts/components/ita/ita_comp_tgrub.c
src/libpts/pts/pts.h
src/libpts/pts/pts_func_comp_evid_req.h [deleted file]
src/libpts/pts/pts_req_func_comp_evid.h [new file with mode: 0644]

index 42d7c3f..f65f6fa 100644 (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,
index 72c90f6..7bed466 100644 (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 \
index e00de61..78c1efb 100644 (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,
index 91d84b9..08da860 100644 (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,
index b5e7724..73065ec 100644 (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"
diff --git a/src/libpts/pts/pts_func_comp_evid_req.h b/src/libpts/pts/pts_func_comp_evid_req.h
deleted file mode 100644 (file)
index 8b07f1e..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2011 Sansar Choinyambuu
- * HSR Hochschule fuer Technik Rapperswil
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- */
-
-/**
- * @defgroup pts_func_comp_evid_req pts_func_comp_evid_req
- * @{ @ingroup pts
- */
-
-#ifndef PTS_FUNC_COMP_EVID_REQ_H_
-#define PTS_FUNC_COMP_EVID_REQ_H_
-
-typedef enum pts_attr_req_func_comp_evid_flag_t pts_attr_req_func_comp_evid_flag_t;
-
-#include <library.h>
-
-/**
- * PTS Request Functional Component Evidence Flags
- */
-enum pts_attr_req_funct_comp_evid_flag_t {
-       /** Transitive Trust Chain flag */
-       PTS_REQ_FUNC_COMP_FLAG_TTC =                            (1<<7),
-       /** Verify Component flag */
-       PTS_REQ_FUNC_COMP_FLAG_VER =                            (1<<6),
-       /** Current Evidence flag */
-       PTS_REQ_FUNC_COMP_FLAG_CURR =                           (1<<5),
-       /** PCR Information flag */
-       PTS_REQ_FUNC_COMP_FLAG_PCR =                            (1<<4),
-};
-
-#endif /** PTS_FUNCT_COMP_EVID_REQ_H_ @}*/
diff --git a/src/libpts/pts/pts_req_func_comp_evid.h b/src/libpts/pts/pts_req_func_comp_evid.h
new file mode 100644 (file)
index 0000000..bbf5bbf
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2011 Sansar Choinyambuu
+ * HSR Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+/**
+ * @defgroup pts_req_func_comp_evid pts_req_func_comp_evid
+ * @{ @ingroup pts
+ */
+
+#ifndef PTS_REQ_FUNC_COMP_EVID_H_
+#define PTS_REQ_FUNC_COMP_EVID_H_
+
+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_req_func_comp_evid_t {
+       /** Transitive Trust Chain flag */
+       PTS_REQ_FUNC_COMP_EVID_TTC =                    (1<<7),
+       /** Verify Component flag */
+       PTS_REQ_FUNC_COMP_EVID_VER =                    (1<<6),
+       /** Current Evidence flag */
+       PTS_REQ_FUNC_COMP_EVID_CURR =                   (1<<5),
+       /** PCR Information flag */
+       PTS_REQ_FUNC_COMP_EVID_PCR =                    (1<<4),
+};
+
+#endif /** PTS_FUNCT_COMP_EVID_REQ_H_ @}*/