From 72f65fc6e9013980dda082490ba774fc5924cf63 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Tue, 1 Sep 2020 15:50:17 +0200 Subject: [PATCH] psa: Rename pss_key_owner_id_t to mbedtls_key_owner_id_t Rename psa_key_owner_id_t to mbedtls_key_owner_id_t to highlight that this is a Mbed TLS specific type and not a type defined in the PSA Cryptography API specification. Signed-off-by: Ronald Cron --- configs/config-psa-crypto.h | 2 +- include/mbedtls/config.h | 2 +- include/psa/crypto_platform.h | 2 +- include/psa/crypto_types.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/config-psa-crypto.h b/configs/config-psa-crypto.h index 70563ae3c..447284b93 100644 --- a/configs/config-psa-crypto.h +++ b/configs/config-psa-crypto.h @@ -1150,7 +1150,7 @@ * * This is only meaningful when building the library as part of a * multi-client service. When you activate this option, you must provide - * an implementation of the type psa_key_owner_id_t and a translation + * an implementation of the type mbedtls_key_owner_id_t and a translation * from psa_key_file_id_t to file name in all the storage backends that * you wish to support. * diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h index 1e6e05275..1209b8340 100644 --- a/include/mbedtls/config.h +++ b/include/mbedtls/config.h @@ -1264,7 +1264,7 @@ * * This is only meaningful when building the library as part of a * multi-client service. When you activate this option, you must provide - * an implementation of the type psa_key_owner_id_t and a translation + * an implementation of the type mbedtls_key_owner_id_t and a translation * from psa_key_file_id_t to file name in all the storage backends that * you wish to support. * diff --git a/include/psa/crypto_platform.h b/include/psa/crypto_platform.h index 0bebb08b6..5e6180e36 100644 --- a/include/psa/crypto_platform.h +++ b/include/psa/crypto_platform.h @@ -52,7 +52,7 @@ typedef uint16_t psa_key_handle_t; #if defined(PSA_CRYPTO_SECURE) /* Building for the PSA Crypto service on a PSA platform. */ /* A key owner is a PSA partition identifier. */ -typedef int32_t psa_key_owner_id_t; +typedef int32_t mbedtls_key_owner_id_t; #endif #endif /* MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER */ diff --git a/include/psa/crypto_types.h b/include/psa/crypto_types.h index a8becb7b8..753fd304a 100644 --- a/include/psa/crypto_types.h +++ b/include/psa/crypto_types.h @@ -262,7 +262,7 @@ static inline psa_key_file_id_t psa_key_file_id_make( typedef struct { psa_key_id_t key_id; - psa_key_owner_id_t owner; + mbedtls_key_owner_id_t owner; } psa_key_file_id_t; #define PSA_KEY_ID_INIT {0, 0} @@ -274,7 +274,7 @@ typedef struct * \param key_id Identifier of the key. */ static inline psa_key_file_id_t psa_key_file_id_make( - psa_key_owner_id_t owner_id, psa_key_id_t key_id ) + mbedtls_key_owner_id_t owner_id, psa_key_id_t key_id ) { return( (psa_key_file_id_t){ .key_id = key_id, .owner = owner_id } );