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_tcsd.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 259 components/trousers/patches/tcsd.h.patch@520697a05dde
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:
2391
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
     1
 
--- src/include/tcsd.h	2010-05-02 19:54:15.000000000 -0700
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
     2
 
+++ src/include/tcsd.h	2012-04-11 12:43:21.508009000 -0700
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
     3
 
@@ -48,14 +48,24 @@
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
     4
 
 							of this TCS System */
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
     5
 
 };
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
     6
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
     7
 
+#ifdef SOLARIS
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
     8
 
+#define	TCSD_CONFIG_FILE	"/etc/security/tcsd.conf"
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
     9
 
+#else
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    10
 
 #define TCSD_CONFIG_FILE	ETC_PREFIX "/tcsd.conf"
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    11
 
+#endif
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    12
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    13
 
 #define TSS_USER_NAME		"tss"
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    14
 
 #define TSS_GROUP_NAME		"tss"
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    15
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    16
 
 #define TCSD_DEFAULT_MAX_THREADS	10
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    17
 
+#ifdef SOLARIS
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    18
 
+#define	TCSD_DEFAULT_SYSTEM_PS_DIR	"/var/tpm/system"
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    19
 
+#define	TCSD_DEFAULT_SYSTEM_PS_FILE	"/var/tpm/system/system.data"
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    20
 
+#define	TCSD_DEFAULT_SOCKET		"/var/tpm/tcsd-socket"
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    21
 
+#else
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    22
 
 #define TCSD_DEFAULT_SYSTEM_PS_FILE	VAR_PREFIX "/lib/tpm/system.data"
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    23
 
 #define TCSD_DEFAULT_SYSTEM_PS_DIR	VAR_PREFIX "/lib/tpm"
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    24
 
+#endif /* SOLARIS */
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    25
 
 #define TCSD_DEFAULT_FIRMWARE_LOG_FILE	"/sys/kernel/security/tpm0/binary_bios_measurements"
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    26
 
 #define TCSD_DEFAULT_KERNEL_LOG_FILE	"/sys/kernel/security/ima/binary_runtime_measurements"
811524a2620b 7123028 Problem with crypto/tss
Tsu-Phong Wu <Tsu-Phong.Wu@oracle.COM>
parents: 259
diff changeset 
    27
 
 #define TCSD_DEFAULT_FIRMWARE_PCRS	0x00000000
upstream/oracle/userland-gate