From 82abd73d662402b25141d709ad9e651e96a52a9b Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Thu, 15 Oct 2026 16:29:22 -0700
Subject: [PATCH] uboot: fix min() type mismatch in asn.c and skip strings.h
 under __UBOOT__

---
 .wolfssl_known_macro_extras | 1 +
 wolfcrypt/src/asn.c         | 4 ++--
 wolfssl/wolfcrypt/types.h   | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.wolfssl_known_macro_extras b/.wolfssl_known_macro_extras
index 4999d764ab..3736600b8c 100644
--- a/.wolfssl_known_macro_extras
+++ b/.wolfssl_known_macro_extras
@@ -1446,6 +1446,7 @@ __TMS320C54X__
 __TMS320C5500__
 __TMS320C55X__
 __TURBOC__
+__UBOOT__
 __UCLIBC_LINUX_SPECIFIC__
 __UCLIBC_MAJOR__
 __UNIX__
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index 18e3f85cb0..8eede42228 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -26085,8 +26085,8 @@ int ParseCertRelative(DecodedCert* cert, int type, int verify,
                     }
                 }
                 else {
-                    cert->maxPathLen = (word16)min(cert->ca->maxPathLen - 1U,
-                                           cert->maxPathLen);
+                    cert->maxPathLen = (word16)min(
+                        (word16)(cert->ca->maxPathLen - 1U), cert->maxPathLen);
                 }
             }
             else {
diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h
index ec3653e3d0..3aebeb7965 100644
--- a/wolfssl/wolfcrypt/types.h
+++ b/wolfssl/wolfcrypt/types.h
@@ -1151,7 +1151,7 @@ enum {
             #define XSTRCASECMP(s1,s2) _stricmp((s1),(s2))
         #else
             #if defined(HAVE_STRINGS_H) && defined(WOLF_C99) && \
-                !defined(WOLFSSL_SGX)
+                !defined(WOLFSSL_SGX) && !defined(__UBOOT__)
                 #include <strings.h>
             #endif
             #if defined(WOLFSSL_DEOS)
@@ -1185,7 +1185,7 @@ enum {
             #define XSTRNCASECMP(s1,s2,n) _strnicmp((s1),(s2),(n))
         #else
             #if defined(HAVE_STRINGS_H) && defined(WOLF_C99) && \
-                !defined(WOLFSSL_SGX)
+                !defined(WOLFSSL_SGX) && !defined(__UBOOT__)
                 #include <strings.h>
             #endif
             #if defined(WOLFSSL_DEOS)