Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/trousers/patches/include_tss_tss_defines.h.patch
author Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
Sat, 20 Oct 2012 00:06:08 -0700
branchs11-sru
changeset 2391 811524a2620b
parent 275 components/trousers/patches/tss_defines.h.patch@e703835db76d
permissions -rw-r--r--
7123028 Problem with crypto/tss 7041927 tcsd and libtspi should not use TCP/IP sockets 7002966 libtspi can segv in .fini section 6896514 tss code doesn't do correct privilege check when using mlock 7162897 tcsd daemon goes into maintenance mode after reboot
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
upstream/oracle/userland-gate