X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=include%2Fopenpts.h;fp=include%2Fopenpts.h;h=bd3923acd25671d8456f4bcd0b877c2225f964d8;hb=c8b098da74f08bf13a520312d357b0e3037838c2;hp=1de7ba07d8db88d4065909596ea7c82989ae4aa5;hpb=a3307391621135b9521d1a7290db8c274961323a;p=openpts%2Fopenpts.git

diff --git a/include/openpts.h b/include/openpts.h
index 1de7ba0..bd3923a 100644
--- a/include/openpts.h
+++ b/include/openpts.h
@@ -409,6 +409,7 @@ typedef struct {
     OPENPTS_TARGET target[];
 } OPENPTS_TARGET_LIST;
 
+/* UUID status */
 #define OPENPTS_UUID_EMPTY         0
 #define OPENPTS_UUID_FILENAME_ONLY 1
 #define OPENPTS_UUID_UUID_ONLY     2
@@ -423,6 +424,7 @@ typedef struct {
     int status;
 } OPENPTS_UUID;
 
+//<<<<<<< HEAD
 /* information about the components described by the models */
 typedef struct {
     char *SimpleName;
@@ -445,6 +447,13 @@ 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
@@ -461,6 +470,11 @@ typedef struct {
     TSS_VERSION tss_version;
     TSS_VERSION pts_version;
 
+    /* Attestation(sign) key */
+    int   aik_storage_type;
+    char *aik_storage_filename;
+    int   aik_auth_type;
+
     /* UUID */
     OPENPTS_UUID * uuid;         /**< Platform(collector) UUID */
     OPENPTS_UUID * rm_uuid;      /**< RM(now) UUID */