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

Merge pull request #5610 from kareem-wolfssl/v5Fips

Browse Source 
Restore v5-dev/v5-ready configure options.
This commit is contained in:
Daniel Pouzzner
2022-09-21 12:56:27 -05:00
committed by GitHub
parent 680182cab5 76afcc1da4
commit 38d4df0c0f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -277,6 +277,8 @@ AS_CASE([$ENABLED_WOLFENGINE],
# v5 - currently, alias for v5-RC12 # v5 - currently, alias for v5-RC12
# ready - FIPS 140-3 settings with in-tree wolfcrypt sources, feature locked # ready - FIPS 140-3 settings with in-tree wolfcrypt sources, feature locked
# dev - FIPS 140-3 settings with in-tree wolfcrypt sources, features freely adjustable # dev - FIPS 140-3 settings with in-tree wolfcrypt sources, features freely adjustable
# v5-ready - Alias for ready.
# v5-dev - Alias for dev.
# #
# These options have been retired, but are listed here for historical reference: # These options have been retired, but are listed here for historical reference:
# v5-RC8 - historical FIPS 140-3 (wolfCrypt WCv5.0-RC8). # v5-RC8 - historical FIPS 140-3 (wolfCrypt WCv5.0-RC8).
@ -287,9 +289,6 @@ AS_CASE([$ENABLED_WOLFENGINE],
# HAVE_FIPS_VERSION = 5, HAVE_FIPS_VERSION_MINOR = 2. # HAVE_FIPS_VERSION = 5, HAVE_FIPS_VERSION_MINOR = 2.
# v5-RC11 - historical FIPS 140-3, wolfCrypt/fips WCv5.0-RC11 # v5-RC11 - historical FIPS 140-3, wolfCrypt/fips WCv5.0-RC11
# HAVE_FIPS_VERSION = 5, HAVE_FIPS_VERSION_MINOR = 2. # HAVE_FIPS_VERSION = 5, HAVE_FIPS_VERSION_MINOR = 2.
# v5-ready - Alias for ready. HAVE_FIPS_VERSION = 5,
# HAVE_FIPS_VERSION_MINOR = 3.
# v5-dev - Alias for dev. HAVE_FIPS_VERSION = 5, HAVE_FIPS_VERSION_MINOR = 3.
AS_CASE([$ENABLED_FIPS], AS_CASE([$ENABLED_FIPS],
[no],[ [no],[
FIPS_VERSION="none" FIPS_VERSION="none"
@ -330,7 +329,7 @@ AS_CASE([$ENABLED_FIPS],
DEF_SP_MATH="no" DEF_SP_MATH="no"
DEF_FAST_MATH="yes" DEF_FAST_MATH="yes"
], ],
[ready],[ [ready|v5-ready],[
FIPS_VERSION="ready" FIPS_VERSION="ready"
HAVE_FIPS_VERSION=5 HAVE_FIPS_VERSION=5
HAVE_FIPS_VERSION_MINOR=3 HAVE_FIPS_VERSION_MINOR=3
@ -338,7 +337,7 @@ AS_CASE([$ENABLED_FIPS],
DEF_SP_MATH="no" DEF_SP_MATH="no"
DEF_FAST_MATH="yes" DEF_FAST_MATH="yes"
], ],
[dev],[ [dev|v5-dev],[
FIPS_VERSION="dev" FIPS_VERSION="dev"
HAVE_FIPS_VERSION=5 HAVE_FIPS_VERSION=5
HAVE_FIPS_VERSION_MINOR=3 HAVE_FIPS_VERSION_MINOR=3