Crypto: Align with Mbed TLS 2.24
Align the PSA Crypto header files in interface folder
with Mbed TLS 2.24.
Change-Id: I28a4e9789183bad3ad15b61480d6b8bb2151d4cb
Signed-off-by: Summer Qin <summer.qin@arm.com>
diff --git a/platform/ext/common/template/crypto_keys.c b/platform/ext/common/template/crypto_keys.c
index 9876a56..6e907ce 100644
--- a/platform/ext/common/template/crypto_keys.c
+++ b/platform/ext/common/template/crypto_keys.c
@@ -38,7 +38,7 @@
extern const size_t initial_attestation_hmac_sha256_key_size;
extern const char *initial_attestation_kid;
#else /* SYMMETRIC_INITIAL_ATTESTATION */
-extern const psa_ecc_curve_t initial_attestation_curve_type;
+extern const psa_ecc_family_t initial_attestation_curve_type;
extern const uint8_t initial_attestation_private_key[];
extern const uint32_t initial_attestation_private_key_size;
#endif /* SYMMETRIC_INITIAL_ATTESTATION */
@@ -131,7 +131,7 @@
tfm_plat_get_initial_attest_key(uint8_t *key_buf,
uint32_t size,
struct ecc_key_t *ecc_key,
- psa_ecc_curve_t *curve_type)
+ psa_ecc_family_t *curve_type)
{
uint8_t *key_dst;
const uint8_t *key_src;
diff --git a/platform/ext/common/template/tfm_initial_attestation_key_material.c b/platform/ext/common/template/tfm_initial_attestation_key_material.c
index c7ba7fb..212c3dd 100644
--- a/platform/ext/common/template/tfm_initial_attestation_key_material.c
+++ b/platform/ext/common/template/tfm_initial_attestation_key_material.c
@@ -60,7 +60,7 @@
/* Type of the EC curve which the key belongs to, in PSA curve ID form */
TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_SP_INITIAL_ATTESTATION")
-const psa_ecc_curve_t initial_attestation_curve_type = PSA_ECC_CURVE_SECP256R1;
+const psa_ecc_family_t initial_attestation_curve_type = PSA_ECC_CURVE_SECP256R1;
/* Initial attestation private key in raw format, without any encoding.
* It belongs to the ECDSA P-256 curve.
diff --git a/platform/ext/target/cypress/psoc64/dummy_crypto_keys.c b/platform/ext/target/cypress/psoc64/dummy_crypto_keys.c
index c7a5354..157ddca 100644
--- a/platform/ext/target/cypress/psoc64/dummy_crypto_keys.c
+++ b/platform/ext/target/cypress/psoc64/dummy_crypto_keys.c
@@ -30,7 +30,7 @@
{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, \
0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F};
-extern const psa_ecc_curve_t initial_attestation_curve_type;
+extern const psa_ecc_family_t initial_attestation_curve_type;
extern const uint8_t initial_attestation_private_key[];
extern const uint32_t initial_attestation_private_key_size;
@@ -81,7 +81,7 @@
tfm_plat_get_initial_attest_key(uint8_t *key_buf,
uint32_t size,
struct ecc_key_t *ecc_key,
- psa_ecc_curve_t *curve_type)
+ psa_ecc_family_t *curve_type)
{
uint8_t *key_dst;
const uint8_t *key_src;
diff --git a/platform/ext/target/musca_b1/crypto_keys.c b/platform/ext/target/musca_b1/crypto_keys.c
index 2f34d8e..c786190 100644
--- a/platform/ext/target/musca_b1/crypto_keys.c
+++ b/platform/ext/target/musca_b1/crypto_keys.c
@@ -29,7 +29,7 @@
#define TFM_KEY_LEN_BYTES 16
-extern const psa_ecc_curve_t initial_attestation_curve_type;
+extern const psa_ecc_family_t initial_attestation_curve_type;
extern const uint8_t initial_attestation_private_key[];
extern const uint32_t initial_attestation_private_key_size;
@@ -73,7 +73,7 @@
tfm_plat_get_initial_attest_key(uint8_t *key_buf,
uint32_t size,
struct ecc_key_t *ecc_key,
- psa_ecc_curve_t *curve_type)
+ psa_ecc_family_t *curve_type)
{
uint32_t key_size = initial_attestation_private_key_size;
int rc;
diff --git a/platform/ext/target/musca_s1/crypto_keys.c b/platform/ext/target/musca_s1/crypto_keys.c
index cdab39f..d42916c 100644
--- a/platform/ext/target/musca_s1/crypto_keys.c
+++ b/platform/ext/target/musca_s1/crypto_keys.c
@@ -34,7 +34,7 @@
#define CC312_NULL_CONTEXT "NO SALT!"
#define CC_BITS_IN_32BIT_WORD 32
-extern const psa_ecc_curve_t initial_attestation_curve_type;
+extern const psa_ecc_family_t initial_attestation_curve_type;
extern const uint8_t initial_attestation_private_key[];
extern const uint32_t initial_attestation_private_key_size;
@@ -131,7 +131,7 @@
tfm_plat_get_initial_attest_key(uint8_t *key_buf,
uint32_t size,
struct ecc_key_t *ecc_key,
- psa_ecc_curve_t *curve_type)
+ psa_ecc_family_t *curve_type)
{
uint32_t key_size = initial_attestation_private_key_size;
int rc;