From 008c8509c60b8379359b8cc7420b3304494e513c Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Fri, 25 Mar 2022 13:26:41 -0500 Subject: [PATCH] multi-test fixes: whitespace in wolfcrypt/src/random.c and wolfcrypt/test/test.c, bugprone-macro-parentheses and -Wenum-compare in WS_RETURN_CODE() (wolfssl/ssl.h), and clang-analyzer-deadcode.DeadStores in api.c. --- tests/api.c | 4 ++-- wolfcrypt/src/random.c | 8 ++++---- wolfcrypt/test/test.c | 2 +- wolfssl/ssl.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/api.c b/tests/api.c index 38e751562..a0e09adf6 100644 --- a/tests/api.c +++ b/tests/api.c @@ -51361,7 +51361,7 @@ static THREAD_RETURN WOLFSSL_THREAD SSL_read_test_server_thread(void* args) } /* bidirectional shutdown */ - while ((ret = wolfSSL_shutdown(ssl)) != WOLFSSL_SUCCESS) { + while (wolfSSL_shutdown(ssl) != WOLFSSL_SUCCESS) { continue; } @@ -51433,7 +51433,7 @@ static THREAD_RETURN WOLFSSL_THREAD SSL_read_test_client_thread(void* args) } } while (ret != WOLFSSL_SUCCESS && err == WC_PENDING_E); - ret = wolfSSL_write(ssl, msg, len); + AssertIntGE(wolfSSL_write(ssl, msg, len), 0); if (0 < (idx = wolfSSL_read(ssl, input, sizeof(input)-1))) { input[idx] = 0; diff --git a/wolfcrypt/src/random.c b/wolfcrypt/src/random.c index 14e3ca202..ea9feea46 100644 --- a/wolfcrypt/src/random.c +++ b/wolfcrypt/src/random.c @@ -2793,14 +2793,14 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz) int wc_hwrng_generate_block(byte *output, word32 sz) { int fd; - int len; - int ret = 0; + int len; + int ret = 0; fd = open("/dev/hwrng", O_RDONLY); if (fd == -1) return OPEN_RAN_E; while(sz) - { - len = (int)read(fd, output, sz); + { + len = (int)read(fd, output, sz); if (len == -1) { ret = READ_RAN_E; diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index f87a2e40a..568a06c9a 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -22081,7 +22081,7 @@ static int ecc_test_curve_size(WC_RNG* rng, int keySize, int testVerifyCount, } #endif /* HAVE_ECC_VERIFY */ #endif /* HAVE_ECC_SIGN */ -#endif /* !ECC_TIMING_RESISTANT || (ECC_TIMING_RESISTANT && +#endif /* !ECC_TIMING_RESISTANT || (ECC_TIMING_RESISTANT && * !WC_NO_RNG && !WOLFSSL_KCAPI_ECC) */ #if defined(HAVE_ECC_KEY_EXPORT) && !defined(WC_NO_RNG) && \ diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index 68feb920a..f22162552 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -786,7 +786,7 @@ enum SNICbReturn { */ #if defined(WOLFSSL_ERROR_CODE_OPENSSL) #define WS_RETURN_CODE(item1,item2) \ - ((item1 < 0) ? item2 : item1) + (((item1) < 0) ? (int)(item2) : (int)(item1)) #else #define WS_RETURN_CODE(item1,item2) (item1) #endif