commit 9bc9659cfbd78d9b842749a942bed22d693cc3fa
author Paul Elliott <paul.elliott@arm.com> Thu Jul 08 16:50:01 2021 +0100
committer Paul Elliott <paul.elliott@arm.com> Fri Jul 23 18:58:18 2021 +0100
tree 1b49b6a05c8d53402cde93653c56edc05eca167a
parent 7fe62cc88b5864de6f9f6d17eac5a53888f5f448

Change PSA Cipher macro safety to use block length

Although checking if the key was symmetric was correct, its easier to
read if we just check the block length is not zero before we use it in a
division.

Signed-off-by: Paul Elliott <paul.elliott@arm.com>

include/psa/crypto_sizes.h

diff --git a/include/psa/crypto_sizes.h b/include/psa/crypto_sizes.h
index b42eb45..098e4f1 100644
--- a/include/psa/crypto_sizes.h
+++ b/include/psa/crypto_sizes.h
@@ -998,8 +998,7 @@
  */
 #define PSA_CIPHER_ENCRYPT_OUTPUT_SIZE(key_type, alg, input_length)             \
     (alg == PSA_ALG_CBC_PKCS7 ?                                                 \
-     (((key_type) & PSA_KEY_TYPE_CATEGORY_MASK)                                 \
-                                           == PSA_KEY_TYPE_CATEGORY_SYMMETRIC ? \
+     (PSA_BLOCK_CIPHER_BLOCK_LENGTH(key_type) != 0 ?                            \
      PSA_ROUND_UP_TO_MULTIPLE(PSA_BLOCK_CIPHER_BLOCK_LENGTH(key_type),          \
                               (input_length) + 1) +                             \
      PSA_CIPHER_IV_LENGTH((key_type), (alg)) : 0) :                             \