uncrustify undo
diff --git a/include/psa/crypto_struct.h b/include/psa/crypto_struct.h
index 4a42372..ed26239 100644
--- a/include/psa/crypto_struct.h
+++ b/include/psa/crypto_struct.h
@@ -86,25 +86,25 @@
{
unsigned dummy; /* Make the union non-empty even with no supported algorithms. */
#if defined(MBEDTLS_MD2_C)
- mbedtls_md2_context md2;
+ mbedtls_md2_context md2;
#endif
#if defined(MBEDTLS_MD4_C)
- mbedtls_md4_context md4;
+ mbedtls_md4_context md4;
#endif
#if defined(MBEDTLS_MD5_C)
- mbedtls_md5_context md5;
+ mbedtls_md5_context md5;
#endif
#if defined(MBEDTLS_RIPEMD160_C)
- mbedtls_ripemd160_context ripemd160;
+ mbedtls_ripemd160_context ripemd160;
#endif
#if defined(MBEDTLS_SHA1_C)
- mbedtls_sha1_context sha1;
+ mbedtls_sha1_context sha1;
#endif
#if defined(MBEDTLS_SHA256_C)
- mbedtls_sha256_context sha256;
+ mbedtls_sha256_context sha256;
#endif
#if defined(MBEDTLS_SHA512_C)
- mbedtls_sha512_context sha512;
+ mbedtls_sha512_context sha512;
#endif
} ctx;
};
@@ -112,26 +112,26 @@
#define PSA_HASH_OPERATION_INIT {0, {0}}
static inline struct psa_hash_operation_s psa_hash_operation_init( void )
{
- const struct psa_hash_operation_s v = PSA_HASH_OPERATION_INIT;
- return (v);
- }
+ const struct psa_hash_operation_s v = PSA_HASH_OPERATION_INIT;
+ return( v );
+}
#if defined(MBEDTLS_MD_C)
- typedef struct
- {
+typedef struct
+{
/** The hash context. */
struct psa_hash_operation_s hash_ctx;
/** The HMAC part of the context. */
uint8_t opad[PSA_HMAC_MAX_HASH_BLOCK_SIZE];
- } psa_hmac_internal_data;
+} psa_hmac_internal_data;
#endif /* MBEDTLS_MD_C */
- struct psa_mac_operation_s
- {
- psa_algorithm_t alg;
- unsigned int key_set : 1;
- unsigned int iv_required : 1;
- unsigned int iv_set : 1;
+struct psa_mac_operation_s
+{
+ psa_algorithm_t alg;
+ unsigned int key_set : 1;
+ unsigned int iv_required : 1;
+ unsigned int iv_set : 1;
unsigned int has_input : 1;
unsigned int is_sign : 1;
uint8_t mac_size;
@@ -139,10 +139,10 @@
{
unsigned dummy; /* Make the union non-empty even with no supported algorithms. */
#if defined(MBEDTLS_MD_C)
- psa_hmac_internal_data hmac;
+ psa_hmac_internal_data hmac;
#endif
#if defined(MBEDTLS_CMAC_C)
- mbedtls_cipher_context_t cmac;
+ mbedtls_cipher_context_t cmac;
#endif
} ctx;
};
@@ -150,15 +150,15 @@
#define PSA_MAC_OPERATION_INIT {0, 0, 0, 0, 0, 0, 0, {0}}
static inline struct psa_mac_operation_s psa_mac_operation_init( void )
{
- const struct psa_mac_operation_s v = PSA_MAC_OPERATION_INIT;
- return (v);
- }
+ const struct psa_mac_operation_s v = PSA_MAC_OPERATION_INIT;
+ return( v );
+}
- struct psa_cipher_operation_s
- {
- psa_algorithm_t alg;
- unsigned int key_set : 1;
- unsigned int iv_required : 1;
+struct psa_cipher_operation_s
+{
+ psa_algorithm_t alg;
+ unsigned int key_set : 1;
+ unsigned int iv_required : 1;
unsigned int iv_set : 1;
uint8_t iv_size;
uint8_t block_size;
@@ -172,14 +172,14 @@
#define PSA_CIPHER_OPERATION_INIT {0, 0, 0, 0, 0, 0, {0}}
static inline struct psa_cipher_operation_s psa_cipher_operation_init( void )
{
- const struct psa_cipher_operation_s v = PSA_CIPHER_OPERATION_INIT;
- return (v);
- }
+ const struct psa_cipher_operation_s v = PSA_CIPHER_OPERATION_INIT;
+ return( v );
+}
- struct psa_aead_operation_s
- {
- psa_algorithm_t alg;
- unsigned int key_set : 1;
+struct psa_aead_operation_s
+{
+ psa_algorithm_t alg;
+ unsigned int key_set : 1;
unsigned int iv_set : 1;
uint8_t iv_size;
uint8_t block_size;
@@ -193,66 +193,66 @@
#define PSA_AEAD_OPERATION_INIT {0, 0, 0, 0, 0, {0}}
static inline struct psa_aead_operation_s psa_aead_operation_init( void )
{
- const struct psa_aead_operation_s v = PSA_AEAD_OPERATION_INIT;
- return (v);
- }
+ const struct psa_aead_operation_s v = PSA_AEAD_OPERATION_INIT;
+ return( v );
+}
#if defined(MBEDTLS_MD_C)
- typedef struct
- {
- uint8_t *info;
- size_t info_length;
- psa_hmac_internal_data hmac;
- uint8_t prk[PSA_HASH_MAX_SIZE];
- uint8_t output_block[PSA_HASH_MAX_SIZE];
+typedef struct
+{
+ uint8_t *info;
+ size_t info_length;
+ psa_hmac_internal_data hmac;
+ uint8_t prk[PSA_HASH_MAX_SIZE];
+ uint8_t output_block[PSA_HASH_MAX_SIZE];
#if PSA_HASH_MAX_SIZE > 0xff
#error "PSA_HASH_MAX_SIZE does not fit in uint8_t"
#endif
- uint8_t offset_in_block;
- uint8_t block_number;
- unsigned int state : 2;
- unsigned int info_set : 1;
- } psa_hkdf_key_derivation_t;
+ uint8_t offset_in_block;
+ uint8_t block_number;
+ unsigned int state : 2;
+ unsigned int info_set : 1;
+} psa_hkdf_key_derivation_t;
#endif /* MBEDTLS_MD_C */
#if defined(MBEDTLS_MD_C)
- typedef enum
- {
- TLS12_PRF_STATE_INIT, /* no input provided */
- TLS12_PRF_STATE_SEED_SET, /* seed has been set */
- TLS12_PRF_STATE_KEY_SET, /* key has been set */
- TLS12_PRF_STATE_LABEL_SET, /* label has been set */
- TLS12_PRF_STATE_OUTPUT /* output has been started */
- } psa_tls12_prf_key_derivation_state_t;
+typedef enum
+{
+ TLS12_PRF_STATE_INIT, /* no input provided */
+ TLS12_PRF_STATE_SEED_SET, /* seed has been set */
+ TLS12_PRF_STATE_KEY_SET, /* key has been set */
+ TLS12_PRF_STATE_LABEL_SET, /* label has been set */
+ TLS12_PRF_STATE_OUTPUT /* output has been started */
+} psa_tls12_prf_key_derivation_state_t;
- typedef struct psa_tls12_prf_key_derivation_s
- {
+typedef struct psa_tls12_prf_key_derivation_s
+{
#if PSA_HASH_MAX_SIZE > 0xff
#error "PSA_HASH_MAX_SIZE does not fit in uint8_t"
#endif
- /* Indicates how many bytes in the current HMAC block have
+ /* Indicates how many bytes in the current HMAC block have
* not yet been read by the user. */
- uint8_t left_in_block;
+ uint8_t left_in_block;
- /* The 1-based number of the block. */
- uint8_t block_number;
+ /* The 1-based number of the block. */
+ uint8_t block_number;
- psa_tls12_prf_key_derivation_state_t state;
+ psa_tls12_prf_key_derivation_state_t state;
- uint8_t *seed;
- size_t seed_length;
- uint8_t *label;
- size_t label_length;
- psa_hmac_internal_data hmac;
- uint8_t Ai[PSA_HASH_MAX_SIZE];
+ uint8_t *seed;
+ size_t seed_length;
+ uint8_t *label;
+ size_t label_length;
+ psa_hmac_internal_data hmac;
+ uint8_t Ai[PSA_HASH_MAX_SIZE];
- /* `HMAC_hash( prk, A(i) + seed )` in the notation of RFC 5246, Sect. 5. */
- uint8_t output_block[PSA_HASH_MAX_SIZE];
- } psa_tls12_prf_key_derivation_t;
+ /* `HMAC_hash( prk, A(i) + seed )` in the notation of RFC 5246, Sect. 5. */
+ uint8_t output_block[PSA_HASH_MAX_SIZE];
+} psa_tls12_prf_key_derivation_t;
#endif /* MBEDTLS_MD_C */
- struct psa_key_derivation_s
+struct psa_key_derivation_s
{
psa_algorithm_t alg;
size_t capacity;
@@ -261,38 +261,38 @@
/* Make the union non-empty even with no supported algorithms. */
uint8_t dummy;
#if defined(MBEDTLS_MD_C)
- psa_hkdf_key_derivation_t hkdf;
- psa_tls12_prf_key_derivation_t tls12_prf;
+ psa_hkdf_key_derivation_t hkdf;
+ psa_tls12_prf_key_derivation_t tls12_prf;
#endif
- } ctx;
+ } ctx;
};
/* This only zeroes out the first byte in the union, the rest is unspecified. */
#define PSA_KEY_DERIVATION_OPERATION_INIT {0, 0, {0}}
static inline struct psa_key_derivation_s psa_key_derivation_operation_init( void )
{
- const struct psa_key_derivation_s v = PSA_KEY_DERIVATION_OPERATION_INIT;
- return (v);
- }
+ const struct psa_key_derivation_s v = PSA_KEY_DERIVATION_OPERATION_INIT;
+ return( v );
+}
- struct psa_key_policy_s
- {
- psa_key_usage_t usage;
- psa_algorithm_t alg;
- psa_algorithm_t alg2;
+struct psa_key_policy_s
+{
+ psa_key_usage_t usage;
+ psa_algorithm_t alg;
+ psa_algorithm_t alg2;
};
typedef struct psa_key_policy_s psa_key_policy_t;
#define PSA_KEY_POLICY_INIT {0, 0, 0}
static inline struct psa_key_policy_s psa_key_policy_init( void )
{
- const struct psa_key_policy_s v = PSA_KEY_POLICY_INIT;
- return (v);
- }
+ const struct psa_key_policy_s v = PSA_KEY_POLICY_INIT;
+ return( v );
+}
- /* The type used internally for key sizes.
+/* The type used internally for key sizes.
* Public interfaces use size_t, but internally we use a smaller type. */
- typedef uint16_t psa_key_bits_t;
+typedef uint16_t psa_key_bits_t;
/* The maximum value of the type used to represent bit-sizes.
* This is used to mark an invalid key size. */
#define PSA_KEY_BITS_TOO_LARGE ( (psa_key_bits_t) ( -1 ) )
@@ -303,14 +303,14 @@
* conditionals. */
#define PSA_MAX_KEY_BITS 0xfff8
- /** A mask of flags that can be stored in key attributes.
+/** A mask of flags that can be stored in key attributes.
*
* This type is also used internally to store flags in slots. Internal
* flags are defined in library/psa_crypto_core.h. Internal flags may have
* the same value as external flags if they are properly handled during
* key creation and in psa_get_key_attributes.
*/
- typedef uint16_t psa_key_attributes_flag_t;
+typedef uint16_t psa_key_attributes_flag_t;
#define MBEDTLS_PSA_KA_FLAG_HAS_SLOT_NUMBER \
( (psa_key_attributes_flag_t) 0x0001 )
@@ -326,26 +326,26 @@
#define MBEDTLS_PSA_KA_MASK_DUAL_USE ( \
0 )
- typedef struct
- {
- psa_key_type_t type;
- psa_key_lifetime_t lifetime;
- psa_key_id_t id;
- psa_key_policy_t policy;
- psa_key_bits_t bits;
+typedef struct
+{
+ psa_key_type_t type;
+ psa_key_lifetime_t lifetime;
+ psa_key_id_t id;
+ psa_key_policy_t policy;
+ psa_key_bits_t bits;
psa_key_attributes_flag_t flags;
} psa_core_key_attributes_t;
#define PSA_CORE_KEY_ATTRIBUTES_INIT {0, 0, PSA_KEY_ID_INIT, PSA_KEY_POLICY_INIT, 0, 0}
struct psa_key_attributes_s
- {
- psa_core_key_attributes_t core;
+{
+ psa_core_key_attributes_t core;
#if defined(MBEDTLS_PSA_CRYPTO_SE_C)
- psa_key_slot_number_t slot_number;
+ psa_key_slot_number_t slot_number;
#endif /* MBEDTLS_PSA_CRYPTO_SE_C */
- void *domain_parameters;
- size_t domain_parameters_size;
+ void *domain_parameters;
+ size_t domain_parameters_size;
};
#if defined(MBEDTLS_PSA_CRYPTO_SE_C)
@@ -368,89 +368,89 @@
attributes->core.lifetime = PSA_KEY_LIFETIME_PERSISTENT;
}
- static inline psa_key_id_t psa_get_key_id(
- const psa_key_attributes_t *attributes)
- {
- return( attributes->core.id );
- }
+static inline psa_key_id_t psa_get_key_id(
+ const psa_key_attributes_t *attributes)
+{
+ return( attributes->core.id );
+}
- static inline void psa_set_key_lifetime(psa_key_attributes_t *attributes,
- psa_key_lifetime_t lifetime)
- {
- attributes->core.lifetime = lifetime;
+static inline void psa_set_key_lifetime(psa_key_attributes_t *attributes,
+ psa_key_lifetime_t lifetime)
+{
+ attributes->core.lifetime = lifetime;
if (PSA_KEY_LIFETIME_IS_VOLATILE(lifetime))
{
#ifdef MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER
- attributes->core.id.key_id = 0;
- attributes->core.id.owner = 0;
+ attributes->core.id.key_id = 0;
+ attributes->core.id.owner = 0;
#else
attributes->core.id = 0;
#endif
- }
}
+}
- static inline psa_key_lifetime_t psa_get_key_lifetime(
- const psa_key_attributes_t *attributes)
- {
+static inline psa_key_lifetime_t psa_get_key_lifetime(
+ const psa_key_attributes_t *attributes)
+{
return( attributes->core.lifetime );
- }
+}
- static inline void psa_set_key_usage_flags(psa_key_attributes_t *attributes,
- psa_key_usage_t usage_flags)
- {
- attributes->core.policy.usage = usage_flags;
- }
+static inline void psa_set_key_usage_flags(psa_key_attributes_t *attributes,
+ psa_key_usage_t usage_flags)
+{
+ attributes->core.policy.usage = usage_flags;
+}
- static inline psa_key_usage_t psa_get_key_usage_flags(
- const psa_key_attributes_t *attributes)
- {
+static inline psa_key_usage_t psa_get_key_usage_flags(
+ const psa_key_attributes_t *attributes)
+{
return( attributes->core.policy.usage );
- }
+}
- static inline void psa_set_key_algorithm(psa_key_attributes_t *attributes,
- psa_algorithm_t alg)
- {
- attributes->core.policy.alg = alg;
- }
+static inline void psa_set_key_algorithm(psa_key_attributes_t *attributes,
+ psa_algorithm_t alg)
+{
+ attributes->core.policy.alg = alg;
+}
- static inline psa_algorithm_t psa_get_key_algorithm(
- const psa_key_attributes_t *attributes)
- {
+static inline psa_algorithm_t psa_get_key_algorithm(
+ const psa_key_attributes_t *attributes)
+{
return( attributes->core.policy.alg );
- }
+}
- /* This function is declared in crypto_extra.h, which comes after this
+/* This function is declared in crypto_extra.h, which comes after this
* header file, but we need the function here, so repeat the declaration. */
- psa_status_t psa_set_key_domain_parameters(psa_key_attributes_t *attributes,
- psa_key_type_t type,
- const uint8_t *data,
- size_t data_length);
+psa_status_t psa_set_key_domain_parameters(psa_key_attributes_t *attributes,
+ psa_key_type_t type,
+ const uint8_t *data,
+ size_t data_length);
- static inline void psa_set_key_type(psa_key_attributes_t *attributes,
- psa_key_type_t type)
- {
+static inline void psa_set_key_type(psa_key_attributes_t *attributes,
+ psa_key_type_t type)
+{
if( attributes->domain_parameters == NULL )
- {
- /* Common case: quick path */
- attributes->core.type = type;
- }
- else
- {
- /* Call the bigger function to free the old domain paramteres.
+ {
+ /* Common case: quick path */
+ attributes->core.type = type;
+ }
+ else
+ {
+ /* Call the bigger function to free the old domain paramteres.
* Ignore any errors which may arise due to type requiring
* non-default domain parameters, since this function can't
* report errors. */
(void) psa_set_key_domain_parameters( attributes, type, NULL, 0 );
- }
}
+}
- static inline psa_key_type_t psa_get_key_type(
- const psa_key_attributes_t *attributes)
- {
+static inline psa_key_type_t psa_get_key_type(
+ const psa_key_attributes_t *attributes)
+{
return( attributes->core.type );
- }
+}
- static inline void psa_set_key_bits(psa_key_attributes_t *attributes,
+static inline void psa_set_key_bits(psa_key_attributes_t *attributes,
size_t bits)
{
if( bits > PSA_MAX_KEY_BITS )