diff options
author | Philipp Deppenwiese <zaolin@das-labor.org> | 2017-10-18 20:26:18 +0200 |
---|---|---|
committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2018-01-18 01:45:35 +0000 |
commit | d88fb36e61beac7b52b6183385de4434895a4995 (patch) | |
tree | 285f48686df7f318b7b57044991bf70ebd4cd42c /src/security/tpm/tcg-2.0 | |
parent | 64e2d19082636de9e82674ccfca574269bb34712 (diff) |
security/tpm: Change TPM naming for different layers.
* Rename tlcl* to tss* as tpm software stack layer.
* Fix inconsistent naming.
Change-Id: I206dd6a32dbd303a6d4d987e424407ebf5c518fa
Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org>
Reviewed-on: https://review.coreboot.org/22104
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/security/tpm/tcg-2.0')
-rw-r--r-- | src/security/tpm/tcg-2.0/tss.c (renamed from src/security/tpm/tcg-2.0/tpm2_tlcl.c) | 6 | ||||
-rw-r--r-- | src/security/tpm/tcg-2.0/tss_marshaling.c (renamed from src/security/tpm/tcg-2.0/tpm2_marshaling.c) | 2 | ||||
-rw-r--r-- | src/security/tpm/tcg-2.0/tss_marshaling.h (renamed from src/security/tpm/tcg-2.0/tpm2_marshaling.h) | 8 | ||||
-rw-r--r-- | src/security/tpm/tcg-2.0/tss_structures.h (renamed from src/security/tpm/tcg-2.0/tpm2_tlcl_structures.h) | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/security/tpm/tcg-2.0/tpm2_tlcl.c b/src/security/tpm/tcg-2.0/tss.c index e111b89ae2..ae8625c0b2 100644 --- a/src/security/tpm/tcg-2.0/tpm2_tlcl.c +++ b/src/security/tpm/tcg-2.0/tss.c @@ -10,9 +10,9 @@ #include <string.h> #include <vb2_api.h> -#include "tpm2_tlcl_structures.h" -#include "tpm2_marshaling.h" -#include "../tpm.h" +#include "tss_structures.h" +#include "tss_marshaling.h" +#include "../tis.h" #include "../antirollback.h" /* diff --git a/src/security/tpm/tcg-2.0/tpm2_marshaling.c b/src/security/tpm/tcg-2.0/tss_marshaling.c index 3ce09a4f8d..b1d666362b 100644 --- a/src/security/tpm/tcg-2.0/tpm2_marshaling.c +++ b/src/security/tpm/tcg-2.0/tss_marshaling.c @@ -10,7 +10,7 @@ #include <stdlib.h> #include <string.h> -#include "tpm2_marshaling.h" +#include "tss_marshaling.h" static uint16_t tpm_tag CAR_GLOBAL; /* Depends on the command type. */ diff --git a/src/security/tpm/tcg-2.0/tpm2_marshaling.h b/src/security/tpm/tcg-2.0/tss_marshaling.h index 5802044378..d34756d566 100644 --- a/src/security/tpm/tcg-2.0/tpm2_marshaling.h +++ b/src/security/tpm/tcg-2.0/tss_marshaling.h @@ -3,11 +3,11 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -#ifndef __SRC_LIB_TPM2_MARSHALING_H -#define __SRC_LIB_TPM2_MARSHALING_H +#ifndef TCG2_TSS_MARSHALING_H_ +#define TCG2_TSS_MARSHALING_H_ #include <commonlib/iobuf.h> -#include "tpm2_tlcl_structures.h" +#include "tss_structures.h" /* The below functions are used to serialize/deserialize TPM2 commands. */ @@ -43,4 +43,4 @@ int tpm_marshal_command(TPM_CC command, void *tpm_command_body, */ struct tpm2_response *tpm_unmarshal_response(TPM_CC command, struct ibuf *ib); -#endif // __SRC_LIB_TPM2_MARSHALING_H +#endif // TCG2_TSS_MARSHALING_H_ diff --git a/src/security/tpm/tcg-2.0/tpm2_tlcl_structures.h b/src/security/tpm/tcg-2.0/tss_structures.h index acd9e74aec..389f15df4b 100644 --- a/src/security/tpm/tcg-2.0/tpm2_tlcl_structures.h +++ b/src/security/tpm/tcg-2.0/tss_structures.h @@ -4,8 +4,8 @@ * found in the LICENSE file. */ -#ifndef __SRC_LIB_TPM2_TLCL_STRUCTURES_H -#define __SRC_LIB_TPM2_TLCL_STRUCTURES_H +#ifndef TCG2_TSS_STRUCTURES_H_ +#define TCG2_TSS_STRUCTURES_H_ /* * This file includes a subset of definitions of TPM protocol version 2.x @@ -15,7 +15,7 @@ #include <compiler.h> #include <types.h> -#include "../tlcl.h" +#include "../tss.h" /* This should be plenty for what firmware needs. */ #define TPM_BUFFER_SIZE 256 @@ -370,4 +370,4 @@ struct tpm2_hierarchy_control_cmd { TPMI_YES_NO state; }; -#endif // __SRC_LIB_TPM2_TLCL_STRUCTURES_H +#endif // TCG2_TSS_STRUCTURES_H_ |