From e6cebf1246068261f2673624f34edec9847e5937 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Wed, 31 Dec 2014 15:20:53 -0700 Subject: [PATCH] fips preservation update --- src/include.am | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/include.am b/src/include.am index c2cf01076..925802d1a 100644 --- a/src/include.am +++ b/src/include.am @@ -13,6 +13,7 @@ src_libwolfssl_la_CPPFLAGS = -DBUILDING_WOLFSSL $(AM_CPPFLAGS) # fips first file if BUILD_FIPS src_libwolfssl_la_SOURCES += ctaocrypt/src/wolfcrypt_first.c +endif src_libwolfssl_la_SOURCES += \ ctaocrypt/src/hmac.c \ @@ -39,18 +40,21 @@ if BUILD_SHA512 src_libwolfssl_la_SOURCES += ctaocrypt/src/sha512.c endif +if BUILD_FIPS src_libwolfssl_la_SOURCES += ctaocrypt/src/fips.c src_libwolfssl_la_SOURCES += ctaocrypt/src/fips_test.c +endif # fips last file +if BUILD_FIPS src_libwolfssl_la_SOURCES += ctaocrypt/src/wolfcrypt_last.c - -else # not BUILD_FIPS +endif src_libwolfssl_la_SOURCES += \ wolfcrypt/src/hmac.c \ wolfcrypt/src/random.c \ wolfcrypt/src/sha256.c + if BUILD_RSA src_libwolfssl_la_SOURCES += wolfcrypt/src/rsa.c endif @@ -71,9 +75,6 @@ if BUILD_SHA512 src_libwolfssl_la_SOURCES += wolfcrypt/src/sha512.c endif -endif # BUILD_FIPS - - if BUILD_FIPS src_libwolfssl_la_SOURCES += \ ctaocrypt/src/logging.c \