Merge pull request #2007 from dgarske/fips_build

Fixes for a few FIPS build macro checks
This commit is contained in:
John Safranek
2019-01-02 10:10:08 -08:00
committed by GitHub
2 changed files with 5 additions and 3 deletions

View File

@@ -31,7 +31,8 @@
#ifdef HAVE_ECC
#if defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2)
#if defined(HAVE_FIPS) && \
defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2)
#include <wolfssl/wolfcrypt/fips.h>
#endif /* HAVE_FIPS_VERSION >= 2 */

View File

@@ -28,9 +28,10 @@
#include <wolfssl/wolfcrypt/types.h>
#ifdef HAVE_FIPS
#if defined(HAVE_FIPS) && \
(!defined(HAVE_FIPS_VERSION) || (HAVE_FIPS_VERSION < 2))
#include <cyassl/ctaocrypt/error-crypt.h>
#endif /* HAVE_FIPS */
#endif /* HAVE_FIPS V1 */
#ifdef __cplusplus
extern "C" {