From e65e9f11c7d7bf654f83b7f6764e828c5726dfe5 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Fri, 22 Dec 2023 14:12:13 -0600 Subject: [PATCH] fixes for clang -Wunreachable-code-aggressive (-Wunreachable-code/clang-diagnostic-unreachable-code in src/ssl.c:wolfSSL_CTX_load_verify_buffer_ex() and -Wunreachable-code/clang-diagnostic-unreachable-code-return in api.c:myCEKwrapFunc()). --- src/ssl.c | 7 ++++--- tests/api.c | 17 ++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index f44a4587a..578274514 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -15762,10 +15762,11 @@ int wolfSSL_set_compression(WOLFSSL* ssl) return BAD_FUNC_ARG; } - verify = GET_VERIFY_SETTING_CTX(ctx); - if (WOLFSSL_LOAD_VERIFY_DEFAULT_FLAGS & - WOLFSSL_LOAD_FLAG_DATE_ERR_OKAY) + #if (WOLFSSL_LOAD_VERIFY_DEFAULT_FLAGS & WOLFSSL_LOAD_FLAG_DATE_ERR_OKAY) verify = VERIFY_SKIP_DATE; + #else + verify = GET_VERIFY_SETTING_CTX(ctx); + #endif if (format == WOLFSSL_FILETYPE_PEM) return ProcessChainBuffer(ctx, in, sz, format, TRUSTED_PEER_TYPE, diff --git a/tests/api.c b/tests/api.c index e4f10ea74..4ded25ef3 100644 --- a/tests/api.c +++ b/tests/api.c @@ -27684,6 +27684,14 @@ static int myCEKwrapFunc(PKCS7* pkcs7, byte* cek, word32 cekSz, byte* keyId, { int ret = -1; + (void)cekSz; + (void)cek; + (void)outSz; + (void)keyIdSz; + (void)direction; + (void)orginKey; /* used with KAKRI */ + (void)orginKeySz; + if (out == NULL) return BAD_FUNC_ARG; @@ -27715,15 +27723,6 @@ static int myCEKwrapFunc(PKCS7* pkcs7, byte* cek, word32 cekSz, byte* keyId, WOLFSSL_MSG("Unsupported key wrap algorithm in example"); return BAD_KEYWRAP_ALG_E; }; - - (void)cekSz; - (void)cek; - (void)outSz; - (void)keyIdSz; - (void)direction; - (void)orginKey; /* used with KAKRI */ - (void)orginKeySz; - return ret; } #endif /* HAVE_PKCS7 && !NO_AES && HAVE_AES_CBC && !NO_AES_256 */