From 355b5821b2ee3f0762987a1c3b65f81b8f31b9ff Mon Sep 17 00:00:00 2001
From: Daniel Pouzzner <douzzer@wolfssl.com>
Date: Sat, 8 Jan 2022 11:43:56 -0600
Subject: [PATCH] WOLFSSL_SESSION_EXPORT: fixes for scan-build complaints
 (deadcode.DeadStores) building --enable-all --enable-sessionexport.

---
 src/internal.c | 2 ++
 tests/api.c    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/internal.c b/src/internal.c
index efbe9a0f3..e8333c2ec 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -5751,12 +5751,14 @@ int InitSSL_Suites(WOLFSSL* ssl)
 #ifndef NO_PSK
     havePSK = (byte)ssl->options.havePSK;
 #endif /* NO_PSK */
+#if !defined(NO_CERTS) && !defined(WOLFSSL_SESSION_EXPORT)
 #ifdef HAVE_ANON
     haveAnon = (byte)ssl->options.haveAnon;
 #endif /* HAVE_ANON*/
 #ifdef WOLFSSL_MULTICAST
     haveMcast = (byte)ssl->options.haveMcast;
 #endif /* WOLFSSL_MULTICAST */
+#endif /* !NO_CERTS && !WOLFSSL_SESSION_EXPORT */
 
 #ifdef WOLFSSL_EARLY_DATA
     if (ssl->options.side == WOLFSSL_SERVER_END)
diff --git a/tests/api.c b/tests/api.c
index d7461907e..010bd2e3a 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -4314,7 +4314,9 @@ static int nonblocking_accept_read(void* args, WOLFSSL* ssl, SOCKET_T* sockfd)
 
     loop_count = ((func_args*)args)->argc;
 
+    #ifdef WOLFSSL_ASYNC_CRYPT
     err = 0; /* Reset error */
+    #endif
     do {
     #ifdef WOLFSSL_ASYNC_CRYPT
         if (err == WC_PENDING_E) {