Skip to content

Commit 838636c

Browse files
add option to not use CT code with min/max
1 parent b8aa4bd commit 838636c

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

wolfcrypt/src/misc.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,8 @@ WC_MISC_STATIC WC_INLINE void ctMaskCopy(byte mask, byte* dst, byte* src,
761761
/* returns the smaller of a and b */
762762
WC_MISC_STATIC WC_INLINE word32 min(word32 a, word32 b)
763763
{
764-
#if !defined(WOLFSSL_NO_CT_OPS) && defined(WORD64_AVAILABLE)
764+
#if !defined(WOLFSSL_NO_CT_OPS) && !defined(WOLFSSL_NO_CT_MAX_MIN) && \
765+
defined(WORD64_AVAILABLE)
765766
word32 gte_mask = (word32)ctMaskWord32GTE(a, b);
766767
return (a & ~gte_mask) | (b & gte_mask);
767768
#else /* WOLFSSL_NO_CT_OPS */
@@ -777,7 +778,8 @@ WC_MISC_STATIC WC_INLINE void ctMaskCopy(byte mask, byte* dst, byte* src,
777778
#endif
778779
WC_MISC_STATIC WC_INLINE word32 max(word32 a, word32 b)
779780
{
780-
#if !defined(WOLFSSL_NO_CT_OPS) && defined(WORD64_AVAILABLE)
781+
#if !defined(WOLFSSL_NO_CT_OPS) && !defined(WOLFSSL_NO_CT_MAX_MIN) && \
782+
defined(WORD64_AVAILABLE)
781783
word32 gte_mask = (word32)ctMaskWord32GTE(a, b);
782784
return (a & gte_mask) | (b & ~gte_mask);
783785
#else /* WOLFSSL_NO_CT_OPS */

0 commit comments

Comments
 (0)