wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 03:07:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

evp.c: fix gating in wolfSSL_EVP_CIPHER_CTX_cleanup() to avoid switch-unreachable; also fix indentation.

Browse Source
This commit is contained in:
Daniel Pouzzner
2023-02-01 01:29:36 -06:00
parent 38c057a084
commit a8a61fe6b7
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
wolfcrypt/src/evp.c
View File

@ -5991,8 +5991,15 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
if (ctx) { if (ctx) {
#if (!defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)) || \ #if (!defined(HAVE_FIPS) && !defined(HAVE_SELFTEST)) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2)) (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2))
#if (defined(HAVE_AESGCM) && defined(WOLFSSL_AESGCM_STREAM)) || \
defined(HAVE_AESCCM) || \
defined(HAVE_AESCBC) || \
defined(WOLFSSL_AES_COUNTER) || \
defined(HAVE_AES_ECB) || \
defined(HAVE_AES_CFB) || \
defined(HAVE_AES_OFB) || \
defined(WOLFSSL_AES_XTS)
#ifndef NO_AES
switch (ctx->cipherType) { switch (ctx->cipherType) {
#if defined(HAVE_AESGCM) && defined(WOLFSSL_AESGCM_STREAM) #if defined(HAVE_AESGCM) && defined(WOLFSSL_AESGCM_STREAM)
case AES_128_GCM_TYPE: case AES_128_GCM_TYPE:
@ -6004,22 +6011,22 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
case AES_192_CCM_TYPE: case AES_192_CCM_TYPE:
case AES_256_CCM_TYPE: case AES_256_CCM_TYPE:
#endif /* HAVE_AESCCM */ #endif /* HAVE_AESCCM */
#ifdef HAVE_AESCBC #ifdef HAVE_AESCBC
case AES_128_CBC_TYPE: case AES_128_CBC_TYPE:
case AES_192_CBC_TYPE: case AES_192_CBC_TYPE:
case AES_256_CBC_TYPE: case AES_256_CBC_TYPE:
#endif #endif
#ifdef WOLFSSL_AES_COUNTER #ifdef WOLFSSL_AES_COUNTER
case AES_128_CTR_TYPE: case AES_128_CTR_TYPE:
case AES_192_CTR_TYPE: case AES_192_CTR_TYPE:
case AES_256_CTR_TYPE: case AES_256_CTR_TYPE:
#endif #endif
#ifdef HAVE_AES_ECB #ifdef HAVE_AES_ECB
case AES_128_ECB_TYPE: case AES_128_ECB_TYPE:
case AES_192_ECB_TYPE: case AES_192_ECB_TYPE:
case AES_256_ECB_TYPE: case AES_256_ECB_TYPE:
#endif #endif
#ifdef HAVE_AES_CFB #ifdef HAVE_AES_CFB
case AES_128_CFB1_TYPE: case AES_128_CFB1_TYPE:
case AES_192_CFB1_TYPE: case AES_192_CFB1_TYPE:
case AES_256_CFB1_TYPE: case AES_256_CFB1_TYPE:
@ -6029,20 +6036,22 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
case AES_128_CFB128_TYPE: case AES_128_CFB128_TYPE:
case AES_192_CFB128_TYPE: case AES_192_CFB128_TYPE:
case AES_256_CFB128_TYPE: case AES_256_CFB128_TYPE:
#endif #endif
#ifdef HAVE_AES_OFB #ifdef HAVE_AES_OFB
case AES_128_OFB_TYPE: case AES_128_OFB_TYPE:
case AES_192_OFB_TYPE: case AES_192_OFB_TYPE:
case AES_256_OFB_TYPE: case AES_256_OFB_TYPE:
#endif #endif
#ifdef WOLFSSL_AES_XTS #ifdef WOLFSSL_AES_XTS
case AES_128_XTS_TYPE: case AES_128_XTS_TYPE:
case AES_256_XTS_TYPE: case AES_256_XTS_TYPE:
#endif #endif
wc_AesFree(&ctx->cipher.aes); wc_AesFree(&ctx->cipher.aes);
} }
#endif /* !NO_AES */
#endif /* AES */
#endif /* not FIPS or FIPS v2+ */ #endif /* not FIPS or FIPS v2+ */
ctx->cipherType = WOLFSSL_EVP_CIPH_TYPE_INIT; /* not yet initialized */ ctx->cipherType = WOLFSSL_EVP_CIPH_TYPE_INIT; /* not yet initialized */
#if defined(HAVE_CHACHA) && defined(HAVE_POLY1305) #if defined(HAVE_CHACHA) && defined(HAVE_POLY1305)
if (ctx->key) { if (ctx->key) {