commit 6603e2b81cb789aa1018acae78714ce49f189010
author Paul Elliott <paul.elliott@arm.com> Thu Jul 08 16:53:42 2021 +0100
committer Paul Elliott <paul.elliott@arm.com> Wed Jul 14 12:39:54 2021 +0100
tree 5e01db1366da589032a6bb4c7803e7baef21cce2
parent c22950c9d057be71938f7509280e72ce19c57cee

Add fix to update output size macro as well.

Same issue with zero block length applies here.

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 1f8b6c3..4c67f10 100644
--- a/include/psa/crypto_sizes.h
+++ b/include/psa/crypto_sizes.h
@@ -1074,12 +1074,13 @@
  */
 #define PSA_CIPHER_UPDATE_OUTPUT_SIZE(key_type, alg, input_length)              \
     (PSA_ALG_IS_CIPHER(alg) ?                                                   \
+    (PSA_BLOCK_CIPHER_BLOCK_LENGTH(key_type) != 0 ?                             \
      (((alg) == PSA_ALG_CBC_PKCS7      ||                                       \
        (alg) == PSA_ALG_CBC_NO_PADDING ||                                       \
        (alg) == PSA_ALG_ECB_NO_PADDING) ?                                       \
       PSA_ROUND_UP_TO_MULTIPLE(PSA_BLOCK_CIPHER_BLOCK_LENGTH(key_type),         \
                                 input_length) :                                 \
-      (input_length)) :                                                         \
+      (input_length)) : 0) :                                                    \
      0)
 
 /** A sufficient output buffer size for psa_cipher_update(), for any of the