commit d911eb79151565c755b5ff5d1c82206d7517c570
author Gilles Peskine <Gilles.Peskine@arm.com> Tue Aug 14 15:18:45 2018 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Mon Oct 08 14:42:11 2018 +0200
tree 4e95b0d1f2fe047c05e95c7f1a88ddbfb1a3ac5e
parent a7aa442c7cdee82eacc55115aeef5a2410e5f27f

Add support for truncated MAC algorithms

include/psa/crypto_sizes.h

diff --git a/include/psa/crypto_sizes.h b/include/psa/crypto_sizes.h
index edb240b..c058afc 100644
--- a/include/psa/crypto_sizes.h
+++ b/include/psa/crypto_sizes.h
@@ -143,7 +143,8 @@
         PSA_VENDOR_ECC_MAX_CURVE_BITS                                   \
         )
 
-
+/** The maximum size of a block cipher supported by the implementation. */
+#define PSA_MAX_BLOCK_CIPHER_BLOCK_SIZE 16
 
 /** The size of the output of psa_mac_sign_finish(), in bytes.
  *
@@ -163,7 +164,8 @@
  *                      with the algorithm.
  */
 #define PSA_MAC_FINAL_SIZE(key_type, key_bits, alg)                     \
-    (PSA_ALG_IS_HMAC(alg) ? PSA_HASH_SIZE(PSA_ALG_HMAC_GET_HASH(alg)) : \
+    ((alg) & PSA_ALG_MAC_TRUNCATION_MASK ? PSA_MAC_TRUNCATED_LENGTH(alg) : \
+     PSA_ALG_IS_HMAC(alg) ? PSA_HASH_SIZE(PSA_ALG_HMAC_GET_HASH(alg)) : \
      PSA_ALG_IS_BLOCK_CIPHER_MAC(alg) ? PSA_BLOCK_CIPHER_BLOCK_SIZE(key_type) : \
      ((void)(key_type), (void)(key_bits), 0))