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

Refined the FIPS “min” logic.

Browse Source
This commit is contained in:
David Garske
2016-12-22 18:11:25 -08:00
parent fc16890641
commit c4af58b973
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/src/misc.c
View File

@ -212,7 +212,9 @@ 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 */
#if defined(HAVE_FIPS) && !defined(min)
#define min min
#endif
STATIC INLINE word32 min(word32 a, word32 b)
{
return a > b ? b : a;

4
wolfssl/wolfcrypt/misc.h
View File

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