author | Dan Anderson <dan.anderson@oracle.com> |
Wed, 18 Apr 2012 16:24:54 -0700 | |
changeset 780 | dda31545a88b |
parent 777 | e2e604cdbd6a |
child 5941 | db8aa9865e9f |
permissions | -rw-r--r-- |
777
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
1 |
--- src/include/tcsd.h 2010-05-02 19:54:15.000000000 -0700 |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
2 |
+++ src/include/tcsd.h 2012-04-11 12:43:21.508009000 -0700 |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
3 |
@@ -48,14 +48,24 @@ |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
4 |
of this TCS System */ |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
5 |
}; |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
6 |
|
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
7 |
+#ifdef SOLARIS |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
8 |
+#define TCSD_CONFIG_FILE "/etc/security/tcsd.conf" |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
9 |
+#else |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
10 |
#define TCSD_CONFIG_FILE ETC_PREFIX "/tcsd.conf" |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
11 |
+#endif |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
12 |
|
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
13 |
#define TSS_USER_NAME "tss" |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
14 |
#define TSS_GROUP_NAME "tss" |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
15 |
|
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
16 |
#define TCSD_DEFAULT_MAX_THREADS 10 |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
17 |
+#ifdef SOLARIS |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
18 |
+#define TCSD_DEFAULT_SYSTEM_PS_DIR "/var/tpm/system" |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
19 |
+#define TCSD_DEFAULT_SYSTEM_PS_FILE "/var/tpm/system/system.data" |
780
dda31545a88b
7123028 Problem with crypto/tss (fix patch)
Dan Anderson <dan.anderson@oracle.com>
parents:
777
diff
changeset
|
20 |
+#define TCSD_DEFAULT_SOCKET "/var/tpm/tcsd-socket" |
777
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
21 |
+#else |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
22 |
#define TCSD_DEFAULT_SYSTEM_PS_FILE VAR_PREFIX "/lib/tpm/system.data" |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
23 |
#define TCSD_DEFAULT_SYSTEM_PS_DIR VAR_PREFIX "/lib/tpm" |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
24 |
+#endif /* SOLARIS */ |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
25 |
#define TCSD_DEFAULT_FIRMWARE_LOG_FILE "/sys/kernel/security/tpm0/binary_bios_measurements" |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
26 |
#define TCSD_DEFAULT_KERNEL_LOG_FILE "/sys/kernel/security/ima/binary_runtime_measurements" |
e2e604cdbd6a
7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents:
259
diff
changeset
|
27 |
#define TCSD_DEFAULT_FIRMWARE_PCRS 0x00000000 |