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/dist_tcsd.conf.in.patch
author Dan Anderson <dan.anderson@oracle.com>
Wed, 18 Apr 2012 16:31:37 -0700
changeset 781 6523d2f0e202
parent 777 e2e604cdbd6a
permissions -rw-r--r--
7123028 Problem with crypto/tss (fix patch) 7041927 tcsd and libtspi should not use TCP/IP sockets (fix patch) 7002966 libtspi can segv in .fini section 7160939 trousers should depend on iconv/utf-8 instead of iconv/unicode-core
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
777
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
     1
 
--- dist/tcsd.conf.in	2010-01-28 08:27:50.000000000 -0800
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
     2
 
+++ dist/tcsd.conf.in	2012-04-12 14:52:21.154590000 -0700
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
     3
 
@@ -9,10 +9,16 @@
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
     4
 
 #
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
     5
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
     6
 
 # Option: port
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
     7
 
-# Values: 1 - 65535
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
     8
 
+# Values: 0 - 65535
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
     9
 
 # Description: The port that the tcsd will listen on.
781
6523d2f0e202 7123028 Problem with crypto/tss (fix patch)
Dan Anderson <dan.anderson@oracle.com>
parents: 777
diff changeset 
    10
 
+# If 0, use UNIX Domain socket /var/tpm/tcsd-socket,
777
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
    11
 
+# otherwise use the specified TCP port (30003 is the traditional tcsd TCP port).
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
    12
 
 #
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
    13
 
-# port = 30003
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
    14
 
+# If using a TCP Port (that is, port is not 0), clients such as tpmadm must set
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
    15
 
+# the port with shell environment variable TSS_TCSD_PORT. For example,
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
    16
 
+#	export TSS_TCSD_PORT=30003
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
    17
 
+#
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
    18
 
+# port = 0
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
    19
 
 #
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
    20
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
    21
 
 # Option: num_threads
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
    22
 
@@ -37,6 +43,7 @@
622
fd8f0e501744 7023102 TCSD should store the TPM Event Log
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents: 259
diff changeset 
    23
 
 #
fd8f0e501744 7023102 TCSD should store the TPM Event Log
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents: 259
diff changeset 
    24
 
 # firmware_log_file = /sys/kernel/security/tpm0/binary_bios_measurements
fd8f0e501744 7023102 TCSD should store the TPM Event Log
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents: 259
diff changeset 
    25
 
 #
fd8f0e501744 7023102 TCSD should store the TPM Event Log
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents: 259
diff changeset 
    26
 
+firmware_log_file=/var/tpm/system/pcrevent.log
fd8f0e501744 7023102 TCSD should store the TPM Event Log
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents: 259
diff changeset 
    27
fd8f0e501744 7023102 TCSD should store the TPM Event Log
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents: 259
diff changeset 
    28
 
 # Option: kernel_log_file
fd8f0e501744 7023102 TCSD should store the TPM Event Log
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents: 259
diff changeset 
    29
 
 # Values: Any absolute directory path
777
e2e604cdbd6a 7123028 Problem with crypto/tss
Dan Anderson <dan.anderson@oracle.com>
parents: 622
diff changeset 
    30
 
@@ -54,7 +61,7 @@
259
520697a05dde 7045320 Move trousers from SFW to Userland
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    31
 
 # Description: A list of PCR indices that are manipulated only by the system
520697a05dde 7045320 Move trousers from SFW to Userland
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    32
 
 #  firmware and therefore are not extended or logged by the TCSD.
520697a05dde 7045320 Move trousers from SFW to Userland
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    33
 
 #
520697a05dde 7045320 Move trousers from SFW to Userland
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    34
 
-# firmware_pcrs =
622
fd8f0e501744 7023102 TCSD should store the TPM Event Log
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents: 259
diff changeset 
    35
 
+firmware_pcrs =0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,20,21
259
520697a05dde 7045320 Move trousers from SFW to Userland
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    36
 
 #
520697a05dde 7045320 Move trousers from SFW to Userland
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    37
520697a05dde 7045320 Move trousers from SFW to Userland
Wyllys Ingersoll <Wyllys.Ingersoll@Oracle.COM>
parents:
diff changeset 
    38
 
 # Option: kernel_pcrs
upstream/oracle/userland-gate