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/pkcs12.c

diff --git a/library/pkcs12.c b/library/pkcs12.c
index 4e12476..4db2a4b 100644
--- a/library/pkcs12.c
+++ b/library/pkcs12.c
@@ -172,7 +172,6 @@
     size_t iv_len = 0;
     size_t finish_olen = 0;
     unsigned int padlen = 0;
-    mbedtls_cipher_padding_t padding;
 
     if (pwd == NULL && pwdlen != 0) {
         return MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA;
@@ -219,7 +218,7 @@
 #if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING)
     /* PKCS12 uses CBC with PKCS7 padding */
 
-    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