From 999657c22f3887f9cb7a062e0e3baa0aad09bf12 Mon Sep 17 00:00:00 2001
From: Eric Blankenhorn <eric@wolfssl.com>
Date: Mon, 9 Dec 2024 11:18:06 -0600
Subject: [PATCH] fixes from review

---
 examples/echoclient/echoclient.c | 2 +-
 tests/srp.c                      | 3 +++
 testsuite/testsuite.c            | 2 +-
 wolfssl/wolfcrypt/settings.h     | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c
index a7dd0ad2f9..7173963cf8 100644
--- a/examples/echoclient/echoclient.c
+++ b/examples/echoclient/echoclient.c
@@ -24,10 +24,10 @@
     #include <config.h>
 #endif
 
-#include <wolfssl/wolfcrypt/settings.h>
 #ifndef WOLFSSL_USER_SETTINGS
     #include <wolfssl/options.h>
 #endif
+#include <wolfssl/wolfcrypt/settings.h>
 
 /* Force enable the compatibility macros for this example */
 #undef TEST_OPENSSL_COEXIST
diff --git a/tests/srp.c b/tests/srp.c
index 649a86efca..36fe93e80f 100644
--- a/tests/srp.c
+++ b/tests/srp.c
@@ -24,6 +24,9 @@
     #include <config.h>
 #endif
 
+#ifndef WOLFSSL_USER_SETTINGS
+    #include <wolfssl/options.h>
+#endif
 #include <wolfssl/wolfcrypt/settings.h>
 
 #include <tests/unit.h>
diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c
index 186a4f9e50..b85ddf66d7 100644
--- a/testsuite/testsuite.c
+++ b/testsuite/testsuite.c
@@ -24,10 +24,10 @@
     #include <config.h>
 #endif
 
-#include <wolfssl/wolfcrypt/settings.h>
 #ifndef WOLFSSL_USER_SETTINGS
     #include <wolfssl/options.h>
 #endif
+#include <wolfssl/wolfcrypt/settings.h>
 
 #undef TEST_OPENSSL_COEXIST /* can't use this option with this example */
 #undef OPENSSL_COEXIST /* can't use this option with this example */
diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index 118eb64a95..9c939da85c 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -328,8 +328,8 @@
     /* NOTE: cyassl_nucleus_defs.h is akin to user_settings.h */
     #include "nucleus.h"
     #include "os/networking/ssl/lite/cyassl_nucleus_defs.h"
-#elif !defined(BUILDING_WOLFSSL) && !defined(HAVE_CONFIG_H) && \
-      !defined(WOLFSSL_OPTIONS_H) && !defined(WOLFSSL_CUSTOM_CONFIG)
+#elif !defined(BUILDING_WOLFSSL) && !defined(WOLFSSL_OPTIONS_H) && \
+      !defined(WOLFSSL_CUSTOM_CONFIG)
     /* This error indicates that the settings header may not be included before
      * other wolfSSL headers. If you are using a custom configuration method,
      * define WOLFSSL_CUSTOM_CONFIG to override this error. */