feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix “min” with ctaocrypt FIPS.

Browse Source
This commit is contained in:
David Garske
2016-12-22 14:01:05 -08:00
parent 3bec816f97
commit fc16890641
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wolfcrypt/src/misc.c
View File

@ -212,6 +212,7 @@ STATIC INLINE int ConstantCompare(const byte* a, const byte* b, int length)
#ifndef WOLFSSL_HAVE_MIN #ifndef WOLFSSL_HAVE_MIN
#define WOLFSSL_HAVE_MIN #define WOLFSSL_HAVE_MIN
#define min min /* for ctaocrypt FIPS */
STATIC INLINE word32 min(word32 a, word32 b) STATIC INLINE word32 min(word32 a, word32 b)
{ {
return a > b ? b : a; return a > b ? b : a;

1
wolfssl/wolfcrypt/misc.h
View File

@ -68,6 +68,7 @@ void ByteReverseWords64(word64*, const word64*, word32);
#endif /* WORD64_AVAILABLE */ #endif /* WORD64_AVAILABLE */
#ifndef WOLFSSL_HAVE_MIN #ifndef WOLFSSL_HAVE_MIN
#define min min /* for ctaocrypt FIPS */
WOLFSSL_LOCAL word32 min(word32 a, word32 b); WOLFSSL_LOCAL word32 min(word32 a, word32 b);
#endif #endif