From 8b84b1fd1b8a3dabd5edd9d01e322cbb63f92a39 Mon Sep 17 00:00:00 2001
From: Daniel Pouzzner <douzzer@wolfssl.com>
Date: Fri, 27 Mar 2026 16:42:25 -0500
Subject: [PATCH] wolfssl/wolfcrypt/coding.h and wolfssl/wolfcrypt/settings.h:
 fix feature activation for WOLFSSL_BASE16 (move from coding.h to settings.h).

---
 wolfssl/wolfcrypt/coding.h   |  9 ---------
 wolfssl/wolfcrypt/settings.h | 10 ++++++++--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/wolfssl/wolfcrypt/coding.h b/wolfssl/wolfcrypt/coding.h
index fc40f4a5df..699c897ca7 100644
--- a/wolfssl/wolfcrypt/coding.h
+++ b/wolfssl/wolfcrypt/coding.h
@@ -76,15 +76,6 @@ WOLFSSL_API int Base64_Decode_nonCT(const byte* in, word32 inLen, byte* out,
                                   word32* outLen);
 #endif
 
-#if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL) || \
-    defined(HAVE_WEBSERVER) || defined(HAVE_FIPS) || \
-    defined(HAVE_ECC_CDH) || defined(HAVE_SELFTEST) || \
-    defined(WOLFSSL_ENCRYPTED_KEYS)
-    #ifndef WOLFSSL_BASE16
-        #define WOLFSSL_BASE16
-    #endif
-#endif
-
 #ifdef WOLFSSL_BASE16
     #ifdef WOLFSSL_API_PREFIX_MAP
         #define Base16_Decode wc_Base16_Decode
diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index 32f08095fd..d320e7fe7f 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -4316,8 +4316,14 @@ extern void uITRON4_free(void *p) ;
     #define WOLFSSL_BASE64_DECODE
 #endif
 
-#if defined(WOLFCRYPT_FIPS_CORE_DYNAMIC_HASH_VALUE) && !defined(WOLFSSL_BASE16)
-    #define WOLFSSL_BASE16
+#if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL) || \
+    defined(HAVE_WEBSERVER) || defined(HAVE_FIPS) || \
+    defined(HAVE_ECC_CDH) || defined(HAVE_SELFTEST) || \
+    defined(WOLFCRYPT_FIPS_CORE_DYNAMIC_HASH_VALUE) || \
+    defined(WOLFSSL_ENCRYPTED_KEYS)
+    #ifndef WOLFSSL_BASE16
+        #define WOLFSSL_BASE16
+    #endif
 #endif
 
 #if defined(FORTRESS) && !defined(HAVE_EX_DATA)