commit 6a4af481e19fea64d0e42f9bd53601c29a8671ed
author Waleed Elmelegy <waleed.elmelegy@arm.com> Mon Jun 26 11:28:42 2023 +0100
committer Waleed Elmelegy <waleed.elmelegy@arm.com> Tue Jun 27 14:07:57 2023 +0100
tree 73083cf484c91bbf2681d031fe39ccbaf4fd77a4
parent 558bdc3f422f342a05c9952892e1d5c45cb4dcb0

Replace struct access with local variable

Replace struct access with local variable to minimize
differnces with development branch.

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 17c8a31..98253c6 100644
--- a/programs/aes/crypt_and_hash.c
+++ b/programs/aes/crypt_and_hash.c
@@ -92,6 +92,7 @@
     const mbedtls_md_info_t *md_info;
     mbedtls_cipher_context_t cipher_ctx;
     mbedtls_md_context_t md_ctx;
+    mbedtls_cipher_mode_t cipher_mode;
     unsigned int cipher_block_size;
     unsigned char md_size;
 #if defined(_WIN32_WCE)
@@ -413,10 +414,11 @@
         /*
          * 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 &&
+        cipher_mode = cipher_info->mode;
+        if (cipher_mode != MBEDTLS_MODE_GCM &&
+            cipher_mode != MBEDTLS_MODE_CTR &&
+            cipher_mode != MBEDTLS_MODE_CFB &&
+            cipher_mode != MBEDTLS_MODE_OFB &&
             ((filesize - md_size) % cipher_block_size) != 0) {
             mbedtls_fprintf(stderr, "File content not a multiple of the block size (%u).\n",
                             cipher_block_size);