diff --git a/wolfcrypt/src/misc.c b/wolfcrypt/src/misc.c index 98b83c7ae..e256073ba 100644 --- a/wolfcrypt/src/misc.c +++ b/wolfcrypt/src/misc.c @@ -761,7 +761,8 @@ WC_MISC_STATIC WC_INLINE void ctMaskCopy(byte mask, byte* dst, byte* src, /* returns the smaller of a and b */ WC_MISC_STATIC WC_INLINE word32 min(word32 a, word32 b) { -#if !defined(WOLFSSL_NO_CT_OPS) && defined(WORD64_AVAILABLE) +#if !defined(WOLFSSL_NO_CT_OPS) && !defined(WOLFSSL_NO_CT_MAX_MIN) && \ + defined(WORD64_AVAILABLE) word32 gte_mask = (word32)ctMaskWord32GTE(a, b); return (a & ~gte_mask) | (b & gte_mask); #else /* WOLFSSL_NO_CT_OPS */ @@ -777,7 +778,8 @@ WC_MISC_STATIC WC_INLINE void ctMaskCopy(byte mask, byte* dst, byte* src, #endif WC_MISC_STATIC WC_INLINE word32 max(word32 a, word32 b) { -#if !defined(WOLFSSL_NO_CT_OPS) && defined(WORD64_AVAILABLE) +#if !defined(WOLFSSL_NO_CT_OPS) && !defined(WOLFSSL_NO_CT_MAX_MIN) && \ + defined(WORD64_AVAILABLE) word32 gte_mask = (word32)ctMaskWord32GTE(a, b); return (a & gte_mask) | (b & ~gte_mask); #else /* WOLFSSL_NO_CT_OPS */