commit 598e92991a67279ff03c2a70bf61cdf4d10b30ad
author Bence Szépkúti <bence.szepkuti@arm.com> Wed Apr 07 10:59:35 2021 +0200
committer Bence Szépkúti <bence.szepkuti@arm.com> Thu Apr 15 17:32:16 2021 +0200
tree 48ce923c863b5552c9e4e28d6eeb4d176ea8c39d
parent 8072db2fcb352d143e08eae1f1553d1c98f82608

Rework PSA_AEAD_NONCE_LENGTH to reduce expansion

Due to repeated calls to PSA_AEAD_NONCE_LENGTH, which in turn calls
PSA_ALG_AEAD_WITH_DEFAULT_LENGTH_TAG several times, some macros updated
in this PR expanded to over 6000 characters, more than the 4095 that ISO
C99 compilers are guaranteed to support.

Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>

include/psa/crypto_sizes.h

diff --git a/include/psa/crypto_sizes.h b/include/psa/crypto_sizes.h
index 0c4647f..205bd0b 100644
--- a/include/psa/crypto_sizes.h
+++ b/include/psa/crypto_sizes.h
@@ -375,11 +375,14 @@
  */
 #define PSA_AEAD_NONCE_LENGTH(key_type, alg) \
     (PSA_BLOCK_CIPHER_BLOCK_LENGTH(key_type) == 16 ? \
-          PSA_ALG_AEAD_WITH_DEFAULT_LENGTH_TAG(alg) == PSA_ALG_CCM ? 13 : \
-          PSA_ALG_AEAD_WITH_DEFAULT_LENGTH_TAG(alg) == PSA_ALG_GCM ? 12 : \
+          PSA_ALG_AEAD_WITH_SHORTENED_TAG(alg, 0) == \
+              PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CCM, 0) ? 13 : \
+          PSA_ALG_AEAD_WITH_SHORTENED_TAG(alg, 0) == \
+              PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_GCM, 0) ? 12 : \
           0 : \
      (key_type) == PSA_KEY_TYPE_CHACHA20 && \
-          PSA_ALG_AEAD_WITH_DEFAULT_LENGTH_TAG(alg) == PSA_ALG_CHACHA20_POLY1305 ? 12 : \
+          PSA_ALG_AEAD_WITH_SHORTENED_TAG(alg, 0) == \
+              PSA_ALG_AEAD_WITH_SHORTENED_TAG(PSA_ALG_CHACHA20_POLY1305, 0) ? 12 : \
      0)
 
 /** The maximum default nonce size among all supported pairs of key types and