commit 6eb4626e3f2320aa9919fa4fcf0af03b7985e9fa
author Waleed Elmelegy <waleed.elmelegy@arm.com> Fri Jun 09 16:58:01 2023 +0100
committer Waleed Elmelegy <waleed.elmelegy@arm.com> Tue Jun 13 12:09:42 2023 +0100
tree f18c2d913315331c5ef4d9551b5a8ce95ff3407a
parent 8eaf2d2ac93c432399a7c580496a45ad16519a17

Fix crypt_and_hash decrypt issue when used with stream cipher

crypt_and_hash decryption fails when used with a stream cipher
mode of operation due to the input not being multiple of block
size, this only applies to block cipher modes and not stream
ciphers.This change exempts CTR, CFB & OFB modes from this check.

Signed-off-by: Waleed Elmelegy <waleed.elmelegy@arm.com>

programs/aes/crypt_and_hash.c

diff --git a/programs/aes/crypt_and_hash.c b/programs/aes/crypt_and_hash.c
index 434c609..11eca75 100644
--- a/programs/aes/crypt_and_hash.c
+++ b/programs/aes/crypt_and_hash.c
@@ -409,6 +409,9 @@
          * Check the file size.
          */
         if (cipher_info->mode != MBEDTLS_MODE_GCM &&
+            cipher_info->mode != MBEDTLS_MODE_CTR &&
+            cipher_info->mode != MBEDTLS_MODE_CFB &&
+            cipher_info->mode != MBEDTLS_MODE_OFB &&
             ((filesize - mbedtls_md_get_size(md_info)) %
              mbedtls_cipher_get_block_size(&cipher_ctx)) != 0) {
             mbedtls_fprintf(stderr, "File content not a multiple of the block size (%u).\n",