lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-12-24 17:41:01 +03:00
Code Activity

Revert "Fix a few IAR warnings"

Browse Source
This commit is contained in:
Gilles Peskine
2023-10-13 11:39:53 +02:00
committed by GitHub
parent 2d67e3a07b
commit 97a6231b5c
3 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/pkcs5.c
View File

@@ -152,7 +152,6 @@ int mbedtls_pkcs5_pbes2_ext(const mbedtls_asn1_buf *pbe_params, int mode,
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 @@ int mbedtls_pkcs5_pbes2_ext(const mbedtls_asn1_buf *pbe_params, int mode,
* "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