diff options
| author | Philip Tricca <philip.b.tricca@intel.com> | 2018-02-27 14:59:49 -0800 |
|---|---|---|
| committer | Andreas Fuchs <andreas.fuchs@sit.fraunhofer.de> | 2018-03-01 22:34:31 +0100 |
| commit | 5a235287f19999770d95882742ab9b4eda8b7cee (patch) | |
| tree | b50b5e4432c23f8a87e463680f2ba822d7b44cab /include | |
| parent | e24bea3d33ed4be10dd8df2cc8704ad118dc5430 (diff) | |
| download | tpm2-tss-5a235287f19999770d95882742ab9b4eda8b7cee.tar.gz | |
libtcti-device: Remove deprecated init function and update man page.
This removes the device TCTI initialization function from the library.
We now expose the dynamic TCTI loading mechanism and the standard
initialization for static and dynamic linking.
Signed-off-by: Philip Tricca <philip.b.tricca@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sapi/tss2_tpm2_types.h | 1 | ||||
| -rw-r--r-- | include/tcti/tcti_device.h | 22 |
2 files changed, 5 insertions, 18 deletions
diff --git a/include/sapi/tss2_tpm2_types.h b/include/sapi/tss2_tpm2_types.h index b09879d5..a52e0fbb 100644 --- a/include/sapi/tss2_tpm2_types.h +++ b/include/sapi/tss2_tpm2_types.h @@ -34,6 +34,7 @@ #endif /* TSS2_API_VERSION_1_2_1_108 */ #include <stdint.h> +#include "tpmb.h" #define TPM2_MAX_COMMAND_SIZE 4096 /* maximum size of a command */ #define TPM2_MAX_RESPONSE_SIZE 4096 /* maximum size of a response */ diff --git a/include/tcti/tcti_device.h b/include/tcti/tcti_device.h index 3b845762..b6e96130 100644 --- a/include/tcti/tcti_device.h +++ b/include/tcti/tcti_device.h @@ -27,31 +27,17 @@ #ifndef TCTI_DEVICE_H #define TCTI_DEVICE_H +#include <sapi/tss2_tcti.h> +#include "common.h" + #ifdef __cplusplus extern "C" { #endif -#include "common.h" - -#include "sapi/tpm20.h" - -#define TCTI_DEVICE_DEFAULT "/dev/tpm0" - -typedef struct { - const char *device_path; -} TCTI_DEVICE_CONF; - -TSS2_RC InitDeviceTcti ( - TSS2_TCTI_CONTEXT *tctiContext, // OUT - size_t *contextSize, // IN/OUT - const TCTI_DEVICE_CONF *config // IN - ) COMPILER_ATTR (deprecated); - TSS2_RC Tss2_Tcti_Device_Init ( TSS2_TCTI_CONTEXT *tctiContext, size_t *size, - const char *conf - ); + const char *conf); #ifdef __cplusplus } |