Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport 2.28: Don't restyle some PSA macros #6897

Merged
merged 2 commits into from
Jan 10, 2023
Merged

Backport 2.28: Don't restyle some PSA macros #6897

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3ce75c
Skip restyling of PSA error code definitions
gilles-peskine-arm Jan 4, 2023
7f3659a
Skip restyling of PSA macros also defined in psa-arch-tests
gilles-peskine-arm Jan 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions include/psa/crypto_values.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@
* value, check with the Arm PSA framework group to pick one that other
* 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. */
#define PSA_SUCCESS ((psa_status_t)0)

Expand Down Expand Up @@ -327,6 +334,8 @@
*/
#define PSA_ERROR_DATA_INVALID ((psa_status_t)-153)

/* *INDENT-ON* */

/**@}*/

/** \defgroup crypto_types Key and algorithm types
Expand Down Expand Up @@ -819,7 +828,9 @@
(((alg) & PSA_ALG_CATEGORY_MASK) == PSA_ALG_CATEGORY_KEY_DERIVATION)

/** 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)
/* *INDENT-ON* */

#define PSA_ALG_HASH_MASK ((psa_algorithm_t)0x000000ff)
/** MD2 */
Expand Down Expand Up @@ -2085,7 +2096,9 @@

/** 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)
/* *INDENT-ON* */
/** The minimum value for a key identifier chosen by the application.
*/
#define PSA_KEY_ID_USER_MIN ((psa_key_id_t)0x00000001)
Expand Down