cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-09-09 23:26:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Stop IAR warning about goto skipping variable definition

Browse Source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-10-13 14:40:14 +01:00
parent 01902779a3
commit 2af05c857a
2 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
library/pkcs12.c
View File

@ -256,21 +256,22 @@ int mbedtls_pkcs12_pbe_ext(mbedtls_asn1_buf *pbe_params, int mode,
} }
#if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING) #if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING)
/* PKCS12 uses CBC with PKCS7 padding */ {
/* PKCS12 uses CBC with PKCS7 padding */
mbedtls_cipher_padding_t padding = MBEDTLS_PADDING_PKCS7; mbedtls_cipher_padding_t padding = MBEDTLS_PADDING_PKCS7;
#if !defined(MBEDTLS_CIPHER_PADDING_PKCS7) #if !defined(MBEDTLS_CIPHER_PADDING_PKCS7)
/* For historical reasons, when decrypting, this function works when /* For historical reasons, when decrypting, this function works when
* decrypting even when support for PKCS7 padding is disabled. In this * decrypting even when support for PKCS7 padding is disabled. In this
* case, it ignores the padding, and so will never report a * case, it ignores the padding, and so will never report a
* password mismatch. * password mismatch.
*/ */
if (mode == MBEDTLS_PKCS12_PBE_DECRYPT) { if (mode == MBEDTLS_PKCS12_PBE_DECRYPT) {
padding = MBEDTLS_PADDING_NONE; padding = MBEDTLS_PADDING_NONE;
} }
#endif #endif
if ((ret = mbedtls_cipher_set_padding_mode(&cipher_ctx, padding)) != 0) { if ((ret = mbedtls_cipher_set_padding_mode(&cipher_ctx, padding)) != 0) {
goto exit; goto exit;
}
} }
#endif /* MBEDTLS_CIPHER_MODE_WITH_PADDING */ #endif /* MBEDTLS_CIPHER_MODE_WITH_PADDING */

32
library/pkcs5.c
View File

@ -251,23 +251,25 @@ int mbedtls_pkcs5_pbes2_ext(const mbedtls_asn1_buf *pbe_params, int mode,
} }
#if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING) #if defined(MBEDTLS_CIPHER_MODE_WITH_PADDING)
/* PKCS5 uses CBC with PKCS7 padding (which is the same as {
* "PKCS5 padding" except that it's typically only called PKCS5 /* PKCS5 uses CBC with PKCS7 padding (which is the same as
* with 64-bit-block ciphers). * "PKCS5 padding" except that it's typically only called PKCS5
*/ * with 64-bit-block ciphers).
mbedtls_cipher_padding_t padding = MBEDTLS_PADDING_PKCS7; */
mbedtls_cipher_padding_t padding = MBEDTLS_PADDING_PKCS7;
#if !defined(MBEDTLS_CIPHER_PADDING_PKCS7) #if !defined(MBEDTLS_CIPHER_PADDING_PKCS7)
/* For historical reasons, when decrypting, this function works when /* For historical reasons, when decrypting, this function works when
* decrypting even when support for PKCS7 padding is disabled. In this * decrypting even when support for PKCS7 padding is disabled. In this
* case, it ignores the padding, and so will never report a * case, it ignores the padding, and so will never report a
* password mismatch. * password mismatch.
*/ */
if (mode == MBEDTLS_DECRYPT) { if (mode == MBEDTLS_DECRYPT) {
padding = MBEDTLS_PADDING_NONE; padding = MBEDTLS_PADDING_NONE;
} }
#endif #endif
if ((ret = mbedtls_cipher_set_padding_mode(&cipher_ctx, padding)) != 0) { if ((ret = mbedtls_cipher_set_padding_mode(&cipher_ctx, padding)) != 0) {
goto exit; goto exit;
}
} }
#endif /* MBEDTLS_CIPHER_MODE_WITH_PADDING */ #endif /* MBEDTLS_CIPHER_MODE_WITH_PADDING */
if ((ret = mbedtls_cipher_crypt(&cipher_ctx, iv, enc_scheme_params.len, if ((ret = mbedtls_cipher_crypt(&cipher_ctx, iv, enc_scheme_params.len,