commit e834d6c9f23b6311ae2471a9a2eeb9ba9090f40e
author Dave Rodgman <dave.rodgman@arm.com> Wed Sep 20 19:06:53 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Wed Sep 20 19:09:51 2023 +0100
tree 674c64bacf02296188dd99efa0c1da6e41b743a9
parent c62f7fcce914b24bb3b990695899d425c6bb6e0c

Move declaration for robustness against future edits

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

library/cipher.c

diff --git a/library/cipher.c b/library/cipher.c
index b398a60..8e8e5b5 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -850,7 +850,6 @@
 {
     size_t i, pad_idx;
     unsigned char padding_len;
-    mbedtls_ct_condition_t bad = MBEDTLS_CT_FALSE;
 
     if (NULL == input || NULL == data_len) {
         return MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA;
@@ -859,7 +858,7 @@
     padding_len = input[input_len - 1];
     *data_len = input_len - padding_len;
 
-    bad = mbedtls_ct_uint_gt(padding_len, input_len);
+    mbedtls_ct_condition_t bad = mbedtls_ct_uint_gt(padding_len, input_len);
     bad = mbedtls_ct_bool_or(bad, mbedtls_ct_uint_eq(padding_len, 0));
 
     /* The number of bytes checked must be independent of padding_len,