commit 427424768a34e7e05d0e63b9d8a99ebcc6316e11
author Yanray Wang <yanray.wang@arm.com> Fri Jul 07 17:28:24 2023 +0800
committer Yanray Wang <yanray.wang@arm.com> Thu Aug 24 11:12:22 2023 +0800
tree 1a154f98dbb2660645cdcb920e534ce678365ade
parent 422a77f7165bdfac0f437d204672f9d61ccc1c5b

aes.c: provide finer guard for RSb

Variable RSb is only used for either computing reverse tables
in aes_gen_tables or AES-decryption function. This commit provides
more guards for when RSb is defined and used.

Signed-off-by: Yanray Wang <yanray.wang@arm.com>

library/aes.c

diff --git a/library/aes.c b/library/aes.c
index 753bc78..95ab392 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -391,9 +391,14 @@
 /*
  * Reverse S-box & tables
  */
-#if !defined(MBEDTLS_AES_SETKEY_ENC_ALT) || !defined(MBEDTLS_AES_DECRYPT_ALT)
+
+#if !defined(MBEDTLS_AES_SETKEY_ENC_ALT) && !defined(MBEDTLS_AES_SETKEY_DEC_ALT)
 static unsigned char RSb[256];
-#endif /* !MBEDTLS_AES_SETKEY_ENC_ALT || !MBEDTLS_AES_DECRYPT_ALT */
+#else /* !MBEDTLS_AES_SETKEY_ENC_ALT && !MBEDTLS_AES_SETKEY_DEC_ALT */
+#if !defined(MBEDTLS_AES_DECRYPT_ALT)
+static unsigned char RSb[256];
+#endif /* !MBEDTLS_AES_DECRYPT_ALT */
+#endif /* !MBEDTLS_AES_SETKEY_ENC_ALT && !MBEDTLS_AES_SETKEY_DEC_ALT */
 
 #if !defined(MBEDTLS_AES_DECRYPT_ALT) || !defined(MBEDTLS_AES_SETKEY_DEC_ALT)
 static uint32_t RT0[256];
@@ -447,7 +452,9 @@
      * generate the forward and reverse S-boxes
      */
     FSb[0x00] = 0x63;
+#if !defined(MBEDTLS_AES_DECRYPT_ALT) || !defined(MBEDTLS_AES_SETKEY_DEC_ALT)
     RSb[0x63] = 0x00;
+#endif
 
     for (i = 1; i < 256; i++) {
         x = pow[255 - log[i]];
@@ -459,7 +466,9 @@
         x ^= y ^ 0x63;
 
         FSb[i] = x;
+#if !defined(MBEDTLS_AES_DECRYPT_ALT) || !defined(MBEDTLS_AES_SETKEY_DEC_ALT)
         RSb[x] = (unsigned char) i;
+#endif
     }
 
     /*
@@ -481,9 +490,9 @@
         FT3[i] = ROTL8(FT2[i]);
 #endif /* !MBEDTLS_AES_FEWER_TABLES */
 
+#if !defined(MBEDTLS_AES_DECRYPT_ALT) || !defined(MBEDTLS_AES_SETKEY_DEC_ALT)
         x = RSb[i];
 
-#if !defined(MBEDTLS_AES_DECRYPT_ALT) || !defined(MBEDTLS_AES_SETKEY_DEC_ALT)
         RT0[i] = ((uint32_t) MUL(0x0E, x)) ^
                  ((uint32_t) MUL(0x09, x) <<  8) ^
                  ((uint32_t) MUL(0x0D, x) << 16) ^