From 492704992a60e8e5ce2a20805369f1173e10a130 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Mon, 4 Apr 2022 09:28:06 -0500 Subject: [PATCH 1/2] wolfssl/wolfcrypt/settings.h: #ifdef WOLFSSL_LINUXKM, make sure config.h is included only once, before masking out inapplicable autodetected features. --- wolfssl/wolfcrypt/settings.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 22c09269e..cef354b81 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -2235,6 +2235,10 @@ extern void uITRON4_free(void *p) ; #ifdef WOLFSSL_LINUXKM + #ifdef HAVE_CONFIG_H + #include + #undef HAVE_CONFIG_H + #endif #ifndef NO_DEV_RANDOM #define NO_DEV_RANDOM #endif From 0d6c283f7a2b7a898fe7c8779b08b800f46c925b Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Mon, 4 Apr 2022 09:29:26 -0500 Subject: [PATCH 2/2] fixes for -Werror=declaration-after-statement in debug builds. --- src/internal.c | 3 ++- tests/api.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/internal.c b/src/internal.c index 930a9f2f6..253d200e9 100644 --- a/src/internal.c +++ b/src/internal.c @@ -16555,7 +16555,6 @@ const char* AlertTypeToString(int type) static void LogAlert(int type) { - (void)type; #ifdef DEBUG_WOLFSSL const char* typeStr; char buff[60]; @@ -16565,6 +16564,8 @@ static void LogAlert(int type) XSNPRINTF(buff, sizeof(buff), "Alert type: %s", typeStr); WOLFSSL_MSG(buff); } +#else + (void)type; #endif /* DEBUG_WOLFSSL */ } diff --git a/tests/api.c b/tests/api.c index bd7bcaf97..d9df77edc 100644 --- a/tests/api.c +++ b/tests/api.c @@ -34851,19 +34851,20 @@ static void msg_cb(int write_p, int version, int content_type, #endif static int msgCb(SSL_CTX *ctx, SSL *ssl) { - (void) ctx; - (void) ssl; #if defined(OPENSSL_ALL) && defined(SESSION_CERTS) && !defined(NO_BIO) STACK_OF(X509)* sk; X509* x509; int i, num; BIO* bio; #endif + (void) ctx; printf("\n===== msgcb called ====\n"); #if defined(SESSION_CERTS) && defined(TEST_PEER_CERT_CHAIN) AssertTrue(SSL_get_peer_cert_chain(ssl) != NULL); AssertIntEQ(((WOLFSSL_X509_CHAIN *)SSL_get_peer_cert_chain(ssl))->count, 2); AssertNotNull(SSL_get0_verified_chain(ssl)); + #else + (void) ssl; #endif #if defined(OPENSSL_ALL) && defined(SESSION_CERTS) && !defined(NO_BIO)