From 3f534e7e079f318a637fb6dfedece5b51072dd7e Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Wed, 15 Sep 2021 03:16:38 -0600
Subject: [PATCH] return macro and macro guards

---
 src/bio.c             |  4 +---
 src/ssl.c             | 19 ++++++++++---------
 wolfssl/openssl/ssl.h |  6 +++---
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/bio.c b/src/bio.c
index 55ec3db40..ef5b85b7c 100644
--- a/src/bio.c
+++ b/src/bio.c
@@ -1660,9 +1660,6 @@ void* wolfSSL_BIO_get_data(WOLFSSL_BIO* bio)
  */
 long wolfSSL_BIO_set_nbio(WOLFSSL_BIO* bio, long on)
 {
-    #ifndef WOLFSSL_DTLS
-    (void)on;
-    #endif
     WOLFSSL_ENTER("wolfSSL_BIO_set_nbio");
 
     if (bio) {
@@ -1696,6 +1693,7 @@ long wolfSSL_BIO_set_nbio(WOLFSSL_BIO* bio, long on)
         }
     }
 
+    (void)on;
     return 1;
 }
 
diff --git a/src/ssl.c b/src/ssl.c
index 1a62e7b6b..fcf11365f 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -30549,19 +30549,20 @@ const WOLFSSL_ObjectInfo wolfssl_object_info[] = {
     #ifdef WOLFSSL_SHA512
         { NID_sha512, SHA512h, oidHashType, "SHA512", "sha512"},
     #endif
-    #ifndef WOLFSSL_NOSHA3_224
+    #ifdef WOLFSSL_SHA3
+        #ifndef WOLFSSL_NOSHA3_224
         { NID_sha3_224, SHA3_224h, oidHashType, "SHA3-224", "sha3-224"},
-    #endif
-    #ifndef WOLFSSL_NOSHA3_256
+        #endif
+        #ifndef WOLFSSL_NOSHA3_256
         { NID_sha3_256, SHA3_256h, oidHashType, "SHA3-256", "sha3-256"},
-    #endif
-    #ifndef WOLFSSL_NOSHA3_384
+        #endif
+        #ifndef WOLFSSL_NOSHA3_384
         { NID_sha3_384, SHA3_384h, oidHashType, "SHA3-384", "sha3-384"},
-    #endif
-    #ifndef WOLFSSL_NOSHA3_512
+        #endif
+        #ifndef WOLFSSL_NOSHA3_512
         { NID_sha3_512, SHA3_512h, oidHashType, "SHA3-512", "sha3-512"},
-    #endif
-
+        #endif
+    #endif /* WOLFSSL_SHA3 */
         /* oidSigType */
     #ifndef NO_DSA
         #ifndef NO_SHA
diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h
index 79a87dd22..5fd51d7e9 100644
--- a/wolfssl/openssl/ssl.h
+++ b/wolfssl/openssl/ssl.h
@@ -1387,9 +1387,9 @@ wolfSSL_X509_STORE_set_verify_cb((WOLFSSL_X509_STORE *)(s), (WOLFSSL_X509_STORE_
 
 /* Some openssl consumers try to detect these options with ifdef, defining
  * here since we use an enum internally instead */
-#define SSL_OP_SINGLE_DH_USE            SSL_OP_SINGLE_DH_USE
-#define SSL_OP_SINGLE_ECDH_USE          SSL_OP_SINGLE_ECDH_USE
-#define SSL_OP_CIPHER_SERVER_PREFERENCE SSL_OP_CIPHER_SERVER_PREFERENCE
+#define SSL_OP_SINGLE_DH_USE            WOLFSSL_OP_SINGLE_DH_USE
+#define SSL_OP_SINGLE_ECDH_USE          WOLFSSL_OP_SINGLE_ECDH_USE
+#define SSL_OP_CIPHER_SERVER_PREFERENCE WOLFSSL_OP_CIPHER_SERVER_PREFERENCE
 
 #define OPENSSL_config	                wolfSSL_OPENSSL_config
 #define OPENSSL_memdup                  wolfSSL_OPENSSL_memdup