components/trousers/patches/include_tss_tss_defines.h.patch
author Yiteng Zhang <yiteng.zhang@oracle.com>
Wed, 06 Jan 2016 11:02:48 -0800
branchs11u3-sru
changeset 5237 c85859d16ccb
parent 777 e2e604cdbd6a
permissions -rw-r--r--
PSARC 2012/341 libssh2 version 1.4.2 15801027 SUNBT7180403 Include libssh2 for use by libcurl 17626706 The man page for libssh2_sftp_fstatvfs is broken
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
275
e703835db76d 7050000 tss_defines.h needs an MRK UUID definition
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset
     1
--- src/include/tss/tss_defines.h.old	Tue May 31 07:39:12 2011
e703835db76d 7050000 tss_defines.h needs an MRK UUID definition
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset
     2
+++ src/include/tss/tss_defines.h	Tue May 31 07:39:52 2011
e703835db76d 7050000 tss_defines.h needs an MRK UUID definition
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset
     3
@@ -1214,6 +1214,9 @@
e703835db76d 7050000 tss_defines.h needs an MRK UUID definition
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset
     4
 #define TSS_UUID_USK5 {0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 9}} // user storage key 5
e703835db76d 7050000 tss_defines.h needs an MRK UUID definition
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset
     5
 #define TSS_UUID_USK6 {0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 10}}// user storage key 6
e703835db76d 7050000 tss_defines.h needs an MRK UUID definition
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset
     6
 
e703835db76d 7050000 tss_defines.h needs an MRK UUID definition
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset
     7
+/* SOLARIS: Migratable Root Key UUID */
e703835db76d 7050000 tss_defines.h needs an MRK UUID definition
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset
     8
+#define TSS_UUID_MRK {0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 11}}
e703835db76d 7050000 tss_defines.h needs an MRK UUID definition
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset
     9
+
e703835db76d 7050000 tss_defines.h needs an MRK UUID definition
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset
    10
 // macro to derive UUIDs for keys whose "OwnerEvict" key is set.
e703835db76d 7050000 tss_defines.h needs an MRK UUID definition
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset
    11
 #define TSS_UUID_OWNEREVICT(i) {0, 0, 0, 0, 0, {0, 0, 0, 0, 1, (i)}}
e703835db76d 7050000 tss_defines.h needs an MRK UUID definition
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset
    12