diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2016-05-18 13:53:45 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2016-05-18 13:53:45 +0000 |
| commit | 5c2173b0dfcb57bb4a07acc58d3fd10066cad4fa (patch) | |
| tree | da9b2df572c6ff11d9931e782ac0888832e1445c /security/trousers/files/patch-src-include-tcsd.h | |
| parent | - Simplify MASTER_SITES (diff) | |
security/trousers:
- Update to 0.3.13.
- Remove CONFLICTS with emulators/tpm-emulator.
Two separate binaries, sbin/tcsd (for actual TPM device) and
sbin/tcsd_emu (for TPM emulator) are now installed. rc.d/tcsd chooses
one of them depending on $tcsd_mode. When tcsd_mode="native" (default)
it runs sbin/tcsd, and when tcsd_mode="emulator" it runs sbin/tcsd_emu.
Note that sbin/tcsd_emu depends on tpmd in emulators/tpm-emulator.
- Simplify @sample.
emulators/tpm-emulator:
- Remove CONFLICTS with security/trousers.
- Simplify rc.d/tpmd.
Notes
Notes:
svn path=/head/; revision=415449
Diffstat (limited to 'security/trousers/files/patch-src-include-tcsd.h')
| -rw-r--r-- | security/trousers/files/patch-src-include-tcsd.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/security/trousers/files/patch-src-include-tcsd.h b/security/trousers/files/patch-src-include-tcsd.h index 612d1b22e32f..86f62b7a2c8a 100644 --- a/security/trousers/files/patch-src-include-tcsd.h +++ b/security/trousers/files/patch-src-include-tcsd.h @@ -1,8 +1,8 @@ ---- src/include/tcsd.h.orig 2010-05-03 11:54:15.000000000 +0900 -+++ src/include/tcsd.h 2010-10-24 22:28:52.708555289 +0900 -@@ -50,14 +50,22 @@ - - #define TCSD_CONFIG_FILE ETC_PREFIX "/tcsd.conf" +--- src/include/tcsd.h.orig 2014-04-24 18:05:44 UTC ++++ src/include/tcsd.h +@@ -53,14 +53,22 @@ struct tcsd_config + #define TCSD_DEFAULT_CONFIG_FILE ETC_PREFIX "/tcsd.conf" + extern char *tcsd_config_file; +#ifndef TSS_USER_NAME #define TSS_USER_NAME "tss" @@ -26,4 +26,4 @@ +#define TCSD_DEFAULT_KERNEL_LOG_FILE "/var/run/ima/binary_runtime_measurements" #define TCSD_DEFAULT_FIRMWARE_PCRS 0x00000000 #define TCSD_DEFAULT_KERNEL_PCRS 0x00000000 - + #define TCSD_DEFAULT_DISABLE_IPV4 0 |