wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 04:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update the BUILD_FIPS_V4 flag to V5. Consolidate the Makefile include for the flavors of FIPS.

Browse Source
This commit is contained in:
John Safranek
2021-03-26 14:56:55 -07:00
parent f1a97904c5
commit 4124640a8d
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -6329,7 +6329,7 @@ AM_CONDITIONAL([BUILD_FIPS_V1],[test "x$FIPS_VERSION" = "xv1"])
AM_CONDITIONAL([BUILD_FIPS_V2],[test "x$FIPS_VERSION" = "xv2"]) AM_CONDITIONAL([BUILD_FIPS_V2],[test "x$FIPS_VERSION" = "xv2"])
AM_CONDITIONAL([BUILD_FIPS_RAND],[test "x$FIPS_VERSION" = "xrand"]) AM_CONDITIONAL([BUILD_FIPS_RAND],[test "x$FIPS_VERSION" = "xrand"])
AM_CONDITIONAL([BUILD_FIPS_V3],[test "x$FIPS_VERSION" = "xv3"]) AM_CONDITIONAL([BUILD_FIPS_V3],[test "x$FIPS_VERSION" = "xv3"])
AM_CONDITIONAL([BUILD_FIPS_V4],[test "x$FIPS_VERSION" = "xv5"]) AM_CONDITIONAL([BUILD_FIPS_V5],[test "x$FIPS_VERSION" = "xv5"])
AM_CONDITIONAL([BUILD_FIPS_CURRENT],[test "x$FIPS_VERSION" = "xv2" || test "x$FIPS_VERSION" = "xv3" || test "x$FIPS_VERSION" = "xv5"]) AM_CONDITIONAL([BUILD_FIPS_CURRENT],[test "x$FIPS_VERSION" = "xv2" || test "x$FIPS_VERSION" = "xv3" || test "x$FIPS_VERSION" = "xv5"])
AM_CONDITIONAL([BUILD_CMAC],[test "x$ENABLED_CMAC" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"]) AM_CONDITIONAL([BUILD_CMAC],[test "x$ENABLED_CMAC" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"])
AM_CONDITIONAL([BUILD_SELFTEST],[test "x$ENABLED_SELFTEST" = "xyes"]) AM_CONDITIONAL([BUILD_SELFTEST],[test "x$ENABLED_SELFTEST" = "xyes"])

4
src/include.am
View File

@@ -208,7 +208,7 @@ src_libwolfssl_la_SOURCES += wolfcrypt/src/fips.c \
src_libwolfssl_la_SOURCES += wolfcrypt/src/wolfcrypt_last.c src_libwolfssl_la_SOURCES += wolfcrypt/src/wolfcrypt_last.c
endif BUILD_FIPS_V3 endif BUILD_FIPS_V3
if BUILD_FIPS_V4 if BUILD_FIPS_V5
# FIPS 140-3 first file # FIPS 140-3 first file
src_libwolfssl_la_SOURCES += \ src_libwolfssl_la_SOURCES += \
wolfcrypt/src/wolfcrypt_first.c wolfcrypt/src/wolfcrypt_first.c
@@ -281,7 +281,7 @@ src_libwolfssl_la_SOURCES += wolfcrypt/src/fips.c \
# fips last file # fips last file
src_libwolfssl_la_SOURCES += wolfcrypt/src/wolfcrypt_last.c src_libwolfssl_la_SOURCES += wolfcrypt/src/wolfcrypt_last.c
endif BUILD_FIPS_V4 endif BUILD_FIPS_V5
endif BUILD_FIPS endif BUILD_FIPS

14
wolfssl/wolfcrypt/include.am
View File

@@ -147,18 +147,8 @@ if BUILD_SELFTEST
nobase_include_HEADERS+= wolfssl/wolfcrypt/selftest.h nobase_include_HEADERS+= wolfssl/wolfcrypt/selftest.h
endif endif
if BUILD_FIPS_V2 if BUILD_FIPS
if !BUILD_FIPS_V1
nobase_include_HEADERS+= wolfssl/wolfcrypt/fips.h nobase_include_HEADERS+= wolfssl/wolfcrypt/fips.h
endif endif
if BUILD_FIPS_RAND
nobase_include_HEADERS+= wolfssl/wolfcrypt/fips.h
endif
if BUILD_FIPS_V3
nobase_include_HEADERS+= wolfssl/wolfcrypt/fips.h
endif
if BUILD_FIPS_V4
nobase_include_HEADERS+= wolfssl/wolfcrypt/fips.h
endif endif