This is an automated email from the ASF dual-hosted git repository. cmcfarlen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push: new 7f299f4443 cmake: add ENABLE_FIPS option (#10679) 7f299f4443 is described below commit 7f299f44430894b176da206e3e011c215230314e Author: Chris McFarlen <ch...@mcfarlen.us> AuthorDate: Mon Oct 30 19:50:50 2023 -0500 cmake: add ENABLE_FIPS option (#10679) Co-authored-by: Chris McFarlen <cmcfar...@apple.com> --- CMakeLists.txt | 3 +++ include/tscore/ink_config.h.cmake.in | 1 + 2 files changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index bbced889e7..709ceb8c2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,6 +107,7 @@ auto_option(UNWIND FEATURE_VAR TS_USE_REMOTE_UNWINDING PACKAGE_DEPENDS unwind) option(ENABLE_ASAN "Use address sanitizer (default OFF)") option(ENABLE_FUZZING "Enable fuzzing (default OFF)") +option(ENABLE_FIPS "Enable fips compliance (default OFF)") option(BUILD_REGRESSION_TESTING "Build regression tests (default ON)" ON) option(BUILD_EXPERIMENTAL_PLUGINS "Build the experimental plugins (default OFF)") set(DEFAULT_STACK_SIZE @@ -539,6 +540,8 @@ if(ENABLE_FUZZING) endif() endif() +set(TS_ENABLE_FIPS ${ENABLE_FIPS}) + # Common includes for everyone include_directories(${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include) diff --git a/include/tscore/ink_config.h.cmake.in b/include/tscore/ink_config.h.cmake.in index 2e99ad4e6b..69b3bfeba4 100644 --- a/include/tscore/ink_config.h.cmake.in +++ b/include/tscore/ink_config.h.cmake.in @@ -186,6 +186,7 @@ const int DEFAULT_STACKSIZE = @DEFAULT_STACK_SIZE@; #cmakedefine01 TS_USE_DIAGS #cmakedefine01 TS_USE_EPOLL #cmakedefine01 TS_USE_FAST_SDK +#cmakedefine01 TS_ENABLE_FIPS #cmakedefine01 TS_USE_GET_DH_2048_256 #cmakedefine01 TS_USE_HELLO_CB #cmakedefine01 TS_USE_HWLOC