commit 97a6231b5c1e0caf10d58498ba8a450f19c24c83
author Gilles Peskine <gilles.peskine@arm.com> Fri Oct 13 11:39:53 2023 +0200
committer GitHub <noreply@github.com> Fri Oct 13 11:39:53 2023 +0200
tree 9cbe6c0894d83858a7ef904786e3a5a9fa5e4e64
parent 2d67e3a07ba0ee9a5b71d351b78b09d07eb1431c

Revert "Fix a few IAR warnings"

library/pkcs5.c

diff --git a/library/pkcs5.c b/library/pkcs5.c
index 3dc97a5..2756d05 100644
--- a/library/pkcs5.c
+++ b/library/pkcs5.c
@@ -152,7 +152,6 @@
     mbedtls_cipher_type_t cipher_alg;
     mbedtls_cipher_context_t cipher_ctx;
     unsigned int padlen = 0;
-    mbedtls_cipher_padding_t padding;
 
     p = pbe_params->p;
     end = p + pbe_params->len;
@@ -247,7 +246,7 @@
      * "PKCS5 padding" except that it's typically only called PKCS5
      * with 64-bit-block ciphers).
      */
-    padding = MBEDTLS_PADDING_PKCS7;
+    mbedtls_cipher_padding_t padding = MBEDTLS_PADDING_PKCS7;
 #if !defined(MBEDTLS_CIPHER_PADDING_PKCS7)
     /* For historical reasons, when decrypting, this function works when
      * decrypting even when support for PKCS7 padding is disabled. In this