Fix “min” with ctaocrypt FIPS.

2016-12-22 14:01:05 -08:00
parent 3bec816f97
commit fc16890641
2 changed files with 2 additions and 0 deletions
--- a/wolfcrypt/src/misc.c
+++ b/wolfcrypt/src/misc.c
@ -212,6 +212,7 @@ STATIC INLINE int ConstantCompare(const byte* a, const byte* b, int length)

 #ifndef WOLFSSL_HAVE_MIN
    #define WOLFSSL_HAVE_MIN
+    #define min min /* for ctaocrypt FIPS */
    STATIC INLINE word32 min(word32 a, word32 b)
    {
        return a > b ? b : a;
--- a/wolfssl/wolfcrypt/misc.h
+++ b/wolfssl/wolfcrypt/misc.h
@ -68,6 +68,7 @@ void   ByteReverseWords64(word64*, const word64*, word32);
 #endif /* WORD64_AVAILABLE */

 #ifndef WOLFSSL_HAVE_MIN
+    #define min min /* for ctaocrypt FIPS */
    WOLFSSL_LOCAL word32 min(word32 a, word32 b);
 #endif