From fc168906410c34da4ee185e1af852a3d05c0d740 Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Thu, 22 Dec 2016 14:01:05 -0800
Subject: [PATCH] =?UTF-8?q?Fix=20=E2=80=9Cmin=E2=80=9D=20with=20ctaocrypt?=
 =?UTF-8?q?=20FIPS.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wolfcrypt/src/misc.c     | 1 +
 wolfssl/wolfcrypt/misc.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/wolfcrypt/src/misc.c b/wolfcrypt/src/misc.c
index 899c64880..c61804123 100644
--- 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;
diff --git a/wolfssl/wolfcrypt/misc.h b/wolfssl/wolfcrypt/misc.h
index 9e8ab15f2..71069c6f5 100644
--- 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