Skip to content

Commit e2e1995

Browse files
committed
Rename AEAD macro to not use double underscores
This pattern (identifiers containing a double underscore anywhere in them) is reserved.
1 parent 89e7655 commit e2e1995

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

include/psa/crypto_values.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,15 +1015,15 @@
10151015
* \return The corresponding AEAD algorithm with the default
10161016
* tag length for that algorithm.
10171017
*/
1018-
#define PSA_ALG_AEAD_WITH_DEFAULT_TAG_LENGTH(aead_alg) \
1019-
( \
1020-
PSA__ALG_AEAD_WITH_DEFAULT_TAG_LENGTH__CASE(aead_alg, PSA_ALG_CCM) \
1021-
PSA__ALG_AEAD_WITH_DEFAULT_TAG_LENGTH__CASE(aead_alg, PSA_ALG_GCM) \
1022-
PSA__ALG_AEAD_WITH_DEFAULT_TAG_LENGTH__CASE(aead_alg, PSA_ALG_CHACHA20_POLY1305) \
1018+
#define PSA_ALG_AEAD_WITH_DEFAULT_TAG_LENGTH(aead_alg) \
1019+
( \
1020+
PSA_ALG_AEAD_WITH_DEFAULT_TAG_LENGTH_CASE(aead_alg, PSA_ALG_CCM) \
1021+
PSA_ALG_AEAD_WITH_DEFAULT_TAG_LENGTH_CASE(aead_alg, PSA_ALG_GCM) \
1022+
PSA_ALG_AEAD_WITH_DEFAULT_TAG_LENGTH_CASE(aead_alg, PSA_ALG_CHACHA20_POLY1305) \
10231023
0)
1024-
#define PSA__ALG_AEAD_WITH_DEFAULT_TAG_LENGTH__CASE(aead_alg, ref) \
1025-
PSA_ALG_AEAD_WITH_TAG_LENGTH(aead_alg, 0) == \
1026-
PSA_ALG_AEAD_WITH_TAG_LENGTH(ref, 0) ? \
1024+
#define PSA_ALG_AEAD_WITH_DEFAULT_TAG_LENGTH_CASE(aead_alg, ref) \
1025+
PSA_ALG_AEAD_WITH_TAG_LENGTH(aead_alg, 0) == \
1026+
PSA_ALG_AEAD_WITH_TAG_LENGTH(ref, 0) ? \
10271027
ref :
10281028

10291029
#define PSA_ALG_RSA_PKCS1V15_SIGN_BASE ((psa_algorithm_t)0x10020000)

tests/scripts/test_psa_constant_names.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ def _argument_split(cls, arguments):
162162
# PSA_ALG_ECDH and PSA_ALG_FFDH are excluded for now as the script
163163
# currently doesn't support them. Deprecated errors are also excluded.
164164
_excluded_names = set(['PSA_ALG_AEAD_WITH_DEFAULT_TAG_LENGTH',
165+
'PSA_ALG_AEAD_WITH_DEFAULT_TAG_LENGTH_CASE',
165166
'PSA_ALG_FULL_LENGTH_MAC',
166167
'PSA_ALG_ECDH',
167168
'PSA_ALG_FFDH',

0 commit comments

Comments
 (0)