Get rid of psa_core_key_attributes_t
The `psa_core_key_attributes_t` structure is no longer used. Remove it.
Switch `psa_key_attributes_t` back to a simple struct, now containing
the fields that were formerly inside its `psa_core_key_attributes_t core`
member. This repairs the build with non-C11 compilers.
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
diff --git a/include/psa/crypto_struct.h b/include/psa/crypto_struct.h
index db85a1a..adb33ed 100644
--- a/include/psa/crypto_struct.h
+++ b/include/psa/crypto_struct.h
@@ -289,33 +289,7 @@
#define MBEDTLS_PSA_KA_MASK_DUAL_USE ( \
0)
-typedef struct {
-#if defined(MBEDTLS_PSA_CRYPTO_SE_C)
- psa_key_slot_number_t MBEDTLS_PRIVATE(slot_number);
-#endif /* MBEDTLS_PSA_CRYPTO_SE_C */
- psa_key_type_t MBEDTLS_PRIVATE(type);
- psa_key_bits_t MBEDTLS_PRIVATE(bits);
- psa_key_lifetime_t MBEDTLS_PRIVATE(lifetime);
- psa_key_policy_t MBEDTLS_PRIVATE(policy);
- psa_key_attributes_flag_t MBEDTLS_PRIVATE(flags);
- /* This type has a different layout in the client view wrt the
- * service view of the key id, i.e. in service view usually is
- * expected to have MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER defined
- * thus adding an owner field to the standard psa_key_id_t. For
- * implementations with client/service separation, this means the
- * object will be marshalled through a transport channel and
- * interpreted differently at each side of the transport. Placing
- * it at the end of structures allows to interpret the structure
- * at the client without reorganizing the memory layout of the
- * struct
- */
- mbedtls_svc_key_id_t MBEDTLS_PRIVATE(id);
-} psa_core_key_attributes_t;
-
struct psa_key_attributes_s {
- union {
- psa_core_key_attributes_t MBEDTLS_PRIVATE(core);
- struct {
#if defined(MBEDTLS_PSA_CRYPTO_SE_C)
psa_key_slot_number_t MBEDTLS_PRIVATE(slot_number);
#endif /* MBEDTLS_PSA_CRYPTO_SE_C */
@@ -336,8 +310,6 @@
* struct
*/
mbedtls_svc_key_id_t MBEDTLS_PRIVATE(id);
- };
- };
};
#if defined(MBEDTLS_PSA_CRYPTO_SE_C)
@@ -345,13 +317,11 @@
#else
#define PSA_KEY_ATTRIBUTES_MAYBE_SLOT_NUMBER
#endif
-#define PSA_CORE_KEY_ATTRIBUTES_INIT { PSA_KEY_ATTRIBUTES_MAYBE_SLOT_NUMBER \
- PSA_KEY_TYPE_NONE, 0, \
- PSA_KEY_LIFETIME_VOLATILE, \
- PSA_KEY_POLICY_INIT, 0, \
- MBEDTLS_SVC_KEY_ID_INIT }
-
-#define PSA_KEY_ATTRIBUTES_INIT { { PSA_CORE_KEY_ATTRIBUTES_INIT } }
+#define PSA_KEY_ATTRIBUTES_INIT { PSA_KEY_ATTRIBUTES_MAYBE_SLOT_NUMBER \
+ PSA_KEY_TYPE_NONE, 0, \
+ PSA_KEY_LIFETIME_VOLATILE, \
+ PSA_KEY_POLICY_INIT, 0, \
+ MBEDTLS_SVC_KEY_ID_INIT }
static inline struct psa_key_attributes_s psa_key_attributes_init(void)
{