Exclude conflicted property

[openpts/openpts.git] / include / openpts.h

diff --git a/include/openpts.h b/include/openpts.h
index e78a634..8967b96 100644 (file)
--- a/include/openpts.h
+++ b/include/openpts.h
@@ -26,7 +26,7 @@
  * \brief 
  * @author Seiji Munetoh <munetoh@users.sourceforge.jp>
  * @date 2010-06-17
- * cleanup 2011-01-21 SM
+ * cleanup 2012-01-02 SM
  *
  */
 
@@ -154,6 +154,7 @@
  */
 typedef struct {
     int num;     /**< */
+    int ignore;   /**< flag to exclude policy check. 0: policy check, 1:ignore*/
     char *name;  /**< name */
     char *value; /**< value */
     void *next;  /**< ptr to the next property */
@@ -424,7 +425,6 @@ typedef struct {
     int status;
 } OPENPTS_UUID;
 
-//<<<<<<< HEAD
 /* information about the components described by the models */
 typedef struct {
     char *SimpleName;
@@ -447,13 +447,6 @@ typedef struct {
     } VendorID_type;
     char *VendorID_Value;
 } OPENPTS_COMPID;
-//=======
-/* Attestation(sign) key */
-#define OPENPTS_AIK_STORAGE_TYPE_TSS  0
-#define OPENPTS_AIK_STORAGE_TYPE_BLOB 1
-#define OPENPTS_AIK_AUTH_TYPE_NULL    0
-#define OPENPTS_AIK_AUTH_TYPE_COMMON  1
-//>>>>>>> 042e40b0979f3e44e75200271e4d1282ce08f72c
 
 /**
  * Config