diff options
author | Tamas Ban <tamas.ban@arm.com> | 2020-08-27 10:15:42 +0100 |
---|---|---|
committer | Tamas Ban <tamas.ban@arm.com> | 2020-09-01 07:55:11 +0000 |
commit | c3c084951c05af4285620c399c748ca4c0851f86 (patch) | |
tree | b8940743acf28774a0e83b2a9bb9f93cf0012a7c /secure_fw | |
parent | b1bfe1085f87a418e453d422d707137cf877f76f (diff) | |
download | trusted-firmware-m-c3c084951c05af4285620c399c748ca4c0851f86.tar.gz |
Attest: Rename files to follow naming convention
In TF-M the partition source files only contain the name of the
partition only in abbreviated format. Rename the non-compliant
files in attestation service to maintain consistency across
partitions.
Change-Id: I0c34e6edc997d366dcf59bf4d139c6a083e83b7b
Signed-off-by: Tamas Ban <tamas.ban@arm.com>
Diffstat (limited to 'secure_fw')
-rw-r--r-- | secure_fw/partitions/initial_attestation/CMakeLists.inc | 10 | ||||
-rw-r--r-- | secure_fw/partitions/initial_attestation/attest.h (renamed from secure_fw/partitions/initial_attestation/attestation.h) | 6 | ||||
-rw-r--r-- | secure_fw/partitions/initial_attestation/attest_asymmetric_key.c (renamed from secure_fw/partitions/initial_attestation/attestation_key.c) | 3 | ||||
-rw-r--r-- | secure_fw/partitions/initial_attestation/attest_core.c (renamed from secure_fw/partitions/initial_attestation/attestation_core.c) | 4 | ||||
-rw-r--r-- | secure_fw/partitions/initial_attestation/attest_key.h (renamed from secure_fw/partitions/initial_attestation/attestation_key.h) | 8 | ||||
-rw-r--r-- | secure_fw/partitions/initial_attestation/attest_symmetric_key.c | 2 | ||||
-rw-r--r-- | secure_fw/partitions/initial_attestation/attest_token_encode.c | 3 | ||||
-rw-r--r-- | secure_fw/partitions/initial_attestation/tfm_attest.c (renamed from secure_fw/partitions/initial_attestation/tfm_attestation.c) | 2 | ||||
-rw-r--r-- | secure_fw/partitions/initial_attestation/tfm_attest_req_mngr.c (renamed from secure_fw/partitions/initial_attestation/tfm_attestation_req_mngr.c) | 2 | ||||
-rw-r--r-- | secure_fw/partitions/initial_attestation/tfm_attest_secure_api.c (renamed from secure_fw/partitions/initial_attestation/tfm_attestation_secure_api.c) | 0 |
10 files changed, 19 insertions, 21 deletions
diff --git a/secure_fw/partitions/initial_attestation/CMakeLists.inc b/secure_fw/partitions/initial_attestation/CMakeLists.inc index ed818181f4..abd6cd2550 100644 --- a/secure_fw/partitions/initial_attestation/CMakeLists.inc +++ b/secure_fw/partitions/initial_attestation/CMakeLists.inc @@ -37,17 +37,17 @@ if (NOT DEFINED ATTEST_CLAIM_VALUE_CHECK) endif() list(APPEND ATTEST_C_SRC - "${INITIAL_ATTESTATION_DIR}/tfm_attestation_secure_api.c" - "${INITIAL_ATTESTATION_DIR}/tfm_attestation.c" - "${INITIAL_ATTESTATION_DIR}/tfm_attestation_req_mngr.c" - "${INITIAL_ATTESTATION_DIR}/attestation_core.c" + "${INITIAL_ATTESTATION_DIR}/tfm_attest_secure_api.c" + "${INITIAL_ATTESTATION_DIR}/tfm_attest.c" + "${INITIAL_ATTESTATION_DIR}/tfm_attest_req_mngr.c" + "${INITIAL_ATTESTATION_DIR}/attest_core.c" "${INITIAL_ATTESTATION_DIR}/attest_token_encode.c" ) if (SYMMETRIC_INITIAL_ATTESTATION) list(APPEND ATTEST_C_SRC "${INITIAL_ATTESTATION_DIR}/attest_symmetric_key.c") else() - list(APPEND ATTEST_C_SRC "${INITIAL_ATTESTATION_DIR}/attestation_key.c") + list(APPEND ATTEST_C_SRC "${INITIAL_ATTESTATION_DIR}/attest_asymmetric_key.c") endif() if (ATTEST_INCLUDE_OPTIONAL_CLAIMS) diff --git a/secure_fw/partitions/initial_attestation/attestation.h b/secure_fw/partitions/initial_attestation/attest.h index 08cbad4a62..820e37dbd3 100644 --- a/secure_fw/partitions/initial_attestation/attestation.h +++ b/secure_fw/partitions/initial_attestation/attest.h @@ -5,8 +5,8 @@ * */ -#ifndef __ATTESTATION_H__ -#define __ATTESTATION_H__ +#ifndef __ATTEST_H__ +#define __ATTEST_H__ #include "psa/initial_attestation.h" #include "tfm_client.h" @@ -129,4 +129,4 @@ initial_attest_get_public_key(const psa_invec *in_vec, uint32_t num_invec, } #endif -#endif /* __ATTESTATION_H__ */ +#endif /* __ATTEST_H__ */ diff --git a/secure_fw/partitions/initial_attestation/attestation_key.c b/secure_fw/partitions/initial_attestation/attest_asymmetric_key.c index c60776dcaf..4f7e11ea1a 100644 --- a/secure_fw/partitions/initial_attestation/attestation_key.c +++ b/secure_fw/partitions/initial_attestation/attest_asymmetric_key.c @@ -6,8 +6,7 @@ * */ -#include "attestation_key.h" -#include "attestation.h" +#include "attest_key.h" #include <stdint.h> #include <stddef.h> #include "tfm_plat_defs.h" diff --git a/secure_fw/partitions/initial_attestation/attestation_core.c b/secure_fw/partitions/initial_attestation/attest_core.c index 641b35e5d8..1077ffaf56 100644 --- a/secure_fw/partitions/initial_attestation/attestation_core.c +++ b/secure_fw/partitions/initial_attestation/attest_core.c @@ -9,8 +9,8 @@ #include <string.h> #include <stddef.h> #include "tfm_client.h" -#include "attestation.h" -#include "attestation_key.h" +#include "attest.h" +#include "attest_key.h" #include "tfm_boot_status.h" #include "tfm_plat_defs.h" #include "tfm_plat_device_id.h" diff --git a/secure_fw/partitions/initial_attestation/attestation_key.h b/secure_fw/partitions/initial_attestation/attest_key.h index c0881fe282..d04e062c2c 100644 --- a/secure_fw/partitions/initial_attestation/attestation_key.h +++ b/secure_fw/partitions/initial_attestation/attest_key.h @@ -5,10 +5,10 @@ * */ -#ifndef __ATTESTATION_KEY_H__ -#define __ATTESTATION_KEY_H__ +#ifndef __ATTEST_KEY_H__ +#define __ATTEST_KEY_H__ -#include "attestation.h" +#include "attest.h" #include "psa/initial_attestation.h" #include "psa/crypto.h" #include "q_useful_buf.h" @@ -115,4 +115,4 @@ attest_get_initial_attestation_key_id(struct q_useful_buf_c *attest_key_id) } #endif -#endif /* __ATTESTATION_KEY_H__ */ +#endif /* __ATTEST_KEY_H__ */ diff --git a/secure_fw/partitions/initial_attestation/attest_symmetric_key.c b/secure_fw/partitions/initial_attestation/attest_symmetric_key.c index cdc8a3e681..601e390f89 100644 --- a/secure_fw/partitions/initial_attestation/attest_symmetric_key.c +++ b/secure_fw/partitions/initial_attestation/attest_symmetric_key.c @@ -9,7 +9,7 @@ #include <stddef.h> #include <stdint.h> -#include "attestation_key.h" +#include "attest_key.h" #include "platform/include/tfm_plat_crypto_keys.h" #include "psa/crypto.h" #include "tfm_memory_utils.h" diff --git a/secure_fw/partitions/initial_attestation/attest_token_encode.c b/secure_fw/partitions/initial_attestation/attest_token_encode.c index 84d06475c7..13b36b26bb 100644 --- a/secure_fw/partitions/initial_attestation/attest_token_encode.c +++ b/secure_fw/partitions/initial_attestation/attest_token_encode.c @@ -19,8 +19,7 @@ #include "t_cose_common.h" #include "q_useful_buf.h" #include "psa/crypto.h" -#include "attestation_key.h" -#include "attestation.h" +#include "attest_key.h" /** diff --git a/secure_fw/partitions/initial_attestation/tfm_attestation.c b/secure_fw/partitions/initial_attestation/tfm_attest.c index 27bd3a1385..c5c418872c 100644 --- a/secure_fw/partitions/initial_attestation/tfm_attestation.c +++ b/secure_fw/partitions/initial_attestation/tfm_attest.c @@ -8,7 +8,7 @@ #include "tfm_api.h" #include "tfm_secure_api.h" #include "service_api.h" -#include "attestation.h" +#include "attest.h" #include "psa/initial_attestation.h" #include "tfm_boot_status.h" diff --git a/secure_fw/partitions/initial_attestation/tfm_attestation_req_mngr.c b/secure_fw/partitions/initial_attestation/tfm_attest_req_mngr.c index 8366bfb79a..6c4e22eeb3 100644 --- a/secure_fw/partitions/initial_attestation/tfm_attestation_req_mngr.c +++ b/secure_fw/partitions/initial_attestation/tfm_attest_req_mngr.c @@ -8,7 +8,7 @@ #include <string.h> #include "psa/initial_attestation.h" #include "psa/crypto.h" -#include "attestation.h" +#include "attest.h" #ifdef TFM_PSA_API #include "psa_manifest/tfm_initial_attestation.h" diff --git a/secure_fw/partitions/initial_attestation/tfm_attestation_secure_api.c b/secure_fw/partitions/initial_attestation/tfm_attest_secure_api.c index 59cbfb3783..59cbfb3783 100644 --- a/secure_fw/partitions/initial_attestation/tfm_attestation_secure_api.c +++ b/secure_fw/partitions/initial_attestation/tfm_attest_secure_api.c |