ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

crypto: Match styles of crypto struct headers 

Make crypto_struct_ipc.h (for use with PSA Crypto clients) match style
with the file it is based on, crypto_struct.h (from Mbed Crypto). This
helps to keep the file diff minimal so it's easy to see the meaningful
(non-style) changes.
pull/11315/head
Jaeden Amero 2019-08-21 15:07:26 +01:00
parent e31916f36f
commit dda4c47a4b
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.astyleignore
View File

@ -4,6 +4,7 @@
^components/TARGET_PSA/services/attestation/attestation.h ^components/TARGET_PSA/services/attestation/attestation.h
^components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/tfm_impl ^components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/tfm_impl
^components/TARGET_PSA/services/attestation/qcbor ^components/TARGET_PSA/services/attestation/qcbor
^components/TARGET_PSA/services/crypto/COMPONENT_PSA_SRV_IPC/crypto_struct_ipc.h
^components/TARGET_PSA/TARGET_TFM ^components/TARGET_PSA/TARGET_TFM
^components/TARGET_PSA/TESTS ^components/TARGET_PSA/TESTS
^features/cryptocell ^features/cryptocell

45
components/TARGET_PSA/services/crypto/COMPONENT_PSA_SRV_IPC/crypto_struct_ipc.h
View File

@ -2,6 +2,16 @@
* \file psa/crypto_struct.h * \file psa/crypto_struct.h
* *
* \brief PSA cryptography module: Mbed TLS structured type implementations * \brief PSA cryptography module: Mbed TLS structured type implementations
*
* \note This file may not be included directly. Applications must
* include psa/crypto.h.
*
* This file contains the definitions of some data structures with
* implementation-specific definitions.
*
* In implementations with isolation between the application and the
* cryptography module, it is expected that the front-end and the back-end
* would have different versions of this file.
*/ */
/* /*
* Copyright (C) 2018, ARM Limited, All Rights Reserved * Copyright (C) 2018, ARM Limited, All Rights Reserved
@ -27,60 +37,65 @@
#include "psa/client.h" #include "psa/client.h"
struct psa_hash_operation_s { struct psa_hash_operation_s
{
psa_handle_t handle; psa_handle_t handle;
}; };
#define PSA_HASH_OPERATION_INIT { PSA_NULL_HANDLE } #define PSA_HASH_OPERATION_INIT { PSA_NULL_HANDLE }
static inline struct psa_hash_operation_s psa_hash_operation_init(void) static inline struct psa_hash_operation_s psa_hash_operation_init( void )
{ {
const struct psa_hash_operation_s v = PSA_HASH_OPERATION_INIT; const struct psa_hash_operation_s v = PSA_HASH_OPERATION_INIT;
return (v); return( v );
} }
struct psa_mac_operation_s { struct psa_mac_operation_s
{
psa_handle_t handle; psa_handle_t handle;
}; };
#define PSA_MAC_OPERATION_INIT { PSA_NULL_HANDLE } #define PSA_MAC_OPERATION_INIT { PSA_NULL_HANDLE }
static inline struct psa_mac_operation_s psa_mac_operation_init(void) static inline struct psa_mac_operation_s psa_mac_operation_init( void )
{ {
const struct psa_mac_operation_s v = PSA_MAC_OPERATION_INIT; const struct psa_mac_operation_s v = PSA_MAC_OPERATION_INIT;
return (v); return( v );
} }
struct psa_cipher_operation_s { struct psa_cipher_operation_s
{
psa_handle_t handle; psa_handle_t handle;
}; };
#define PSA_CIPHER_OPERATION_INIT { PSA_NULL_HANDLE } #define PSA_CIPHER_OPERATION_INIT { PSA_NULL_HANDLE }
static inline struct psa_cipher_operation_s psa_cipher_operation_init(void) static inline struct psa_cipher_operation_s psa_cipher_operation_init( void )
{ {
const struct psa_cipher_operation_s v = PSA_CIPHER_OPERATION_INIT; const struct psa_cipher_operation_s v = PSA_CIPHER_OPERATION_INIT;
return (v); return( v );
} }
struct psa_crypto_generator_s { struct psa_crypto_generator_s
{
psa_handle_t handle; psa_handle_t handle;
}; };
#define PSA_CRYPTO_GENERATOR_INIT { PSA_NULL_HANDLE } #define PSA_CRYPTO_GENERATOR_INIT { PSA_NULL_HANDLE }
static inline struct psa_crypto_generator_s psa_crypto_generator_init(void) static inline struct psa_crypto_generator_s psa_crypto_generator_init( void )
{ {
const struct psa_crypto_generator_s v = PSA_CRYPTO_GENERATOR_INIT; const struct psa_crypto_generator_s v = PSA_CRYPTO_GENERATOR_INIT;
return (v); return( v );
} }
struct psa_key_policy_s { struct psa_key_policy_s
{
psa_key_usage_t usage; psa_key_usage_t usage;
psa_algorithm_t alg; psa_algorithm_t alg;
}; };
#define PSA_KEY_POLICY_INIT {0, 0} #define PSA_KEY_POLICY_INIT {0, 0}
static inline struct psa_key_policy_s psa_key_policy_init(void) static inline struct psa_key_policy_s psa_key_policy_init( void )
{ {
const struct psa_key_policy_s v = PSA_KEY_POLICY_INIT; const struct psa_key_policy_s v = PSA_KEY_POLICY_INIT;
return (v); return( v );
} }
#endif /* PSA_CRYPTO_STRUCT_H */ #endif /* PSA_CRYPTO_STRUCT_H */