lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-05-28 16:21:27 +03:00
Code

Merge pull request #6897 from gilles-peskine-arm/code-style-casts-psa-headers-2.28

Browse Source 
Backport 2.28: Don't restyle some PSA macros
This commit is contained in:
Gilles Peskine 2023-01-10 22:09:10 +01:00 committed by GitHub
commit 83fc93e154
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/psa/crypto_values.h
View File

@ -57,6 +57,13 @@
* value, check with the Arm PSA framework group to pick one that other * value, check with the Arm PSA framework group to pick one that other
* domains aren't already using. */ * domains aren't already using. */
/* Tell uncrustify not to touch the constant definitions, otherwise
* it might change the spacing to something that is not PSA-compliant
* (e.g. adding a space after casts).
*
* *INDENT-OFF*
*/
/** The action was completed successfully. */ /** The action was completed successfully. */
#define PSA_SUCCESS ((psa_status_t)0) #define PSA_SUCCESS ((psa_status_t)0)
@ -327,6 +334,8 @@
*/ */
#define PSA_ERROR_DATA_INVALID ((psa_status_t)-153) #define PSA_ERROR_DATA_INVALID ((psa_status_t)-153)
/* *INDENT-ON* */
/**@}*/ /**@}*/
/** \defgroup crypto_types Key and algorithm types /** \defgroup crypto_types Key and algorithm types
@ -819,7 +828,9 @@
(((alg) & PSA_ALG_CATEGORY_MASK) == PSA_ALG_CATEGORY_KEY_DERIVATION) (((alg) & PSA_ALG_CATEGORY_MASK) == PSA_ALG_CATEGORY_KEY_DERIVATION)
/** An invalid algorithm identifier value. */ /** An invalid algorithm identifier value. */
/* *INDENT-OFF* (https://github.com/ARM-software/psa-arch-tests/issues/337) */
#define PSA_ALG_NONE ((psa_algorithm_t)0) #define PSA_ALG_NONE ((psa_algorithm_t)0)
/* *INDENT-ON* */
#define PSA_ALG_HASH_MASK ((psa_algorithm_t)0x000000ff) #define PSA_ALG_HASH_MASK ((psa_algorithm_t)0x000000ff)
/** MD2 */ /** MD2 */
@ -2085,7 +2096,9 @@
/** The null key identifier. /** The null key identifier.
*/ */
/* *INDENT-OFF* (https://github.com/ARM-software/psa-arch-tests/issues/337) */
#define PSA_KEY_ID_NULL ((psa_key_id_t)0) #define PSA_KEY_ID_NULL ((psa_key_id_t)0)
/* *INDENT-ON* */
/** The minimum value for a key identifier chosen by the application. /** The minimum value for a key identifier chosen by the application.
*/ */
#define PSA_KEY_ID_USER_MIN ((psa_key_id_t)0x00000001) #define PSA_KEY_ID_USER_MIN ((psa_key_id_t)0x00000001)