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

Fix building ML-KEM and LMS with cmake

Browse Source
This commit is contained in:
Anthony Hu
2025-04-04 17:54:09 -04:00
parent 3ff4e5e303
commit 6cd1d7f3c9
2 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
CMakeLists.txt
View File

@@ -573,10 +573,15 @@ add_option(WOLFSSL_OQS
"no" "yes;no") "no" "yes;no")
# ML-KEM/Kyber # ML-KEM/Kyber
add_option(WOLFSSL_MMLKEM add_option(WOLFSSL_MLKEM
"Enable the wolfSSL PQ ML-KEM library (default: disabled)" "Enable the wolfSSL PQ ML-KEM library (default: disabled)"
"no" "yes;no") "no" "yes;no")
# LMS
add_option(WOLFSSL_LMS
"Enable the PQ LMS Stateful Hash-based Signature Scheme (default: disabled)"
"no" "yes;no")
# Experimental features # Experimental features
add_option(WOLFSSL_EXPERIMENTAL add_option(WOLFSSL_EXPERIMENTAL
"Enable experimental features (default: disabled)" "Enable experimental features (default: disabled)"
@@ -590,7 +595,7 @@ if (WOLFSSL_EXPERIMENTAL)
# check if any experimental features are also enabled: # check if any experimental features are also enabled:
set(WOLFSSL_FOUND_EXPERIMENTAL_FEATURE 0) set(WOLFSSL_FOUND_EXPERIMENTAL_FEATURE 0)
set_wolfssl_definitions("WOLFSSL_EXPERIMENTAL_SETTINGS" RESUlT) set_wolfssl_definitions("WOLFSSL_EXPERIMENTAL_SETTINGS" RESULT)
# Checking for experimental feature: OQS # Checking for experimental feature: OQS
message(STATUS "Looking for WOLFSSL_OQS") message(STATUS "Looking for WOLFSSL_OQS")
@@ -605,9 +610,9 @@ if (WOLFSSL_EXPERIMENTAL)
list(APPEND WOLFSSL_LINK_LIBS ${OQS_LIBRARY}) list(APPEND WOLFSSL_LINK_LIBS ${OQS_LIBRARY})
list(APPEND WOLFSSL_INCLUDE_DIRS ${OQS_INCLUDE_DIR}) list(APPEND WOLFSSL_INCLUDE_DIRS ${OQS_INCLUDE_DIR})
set_wolfssl_definitions("HAVE_LIBOQS" RESUlT) set_wolfssl_definitions("HAVE_LIBOQS" RESULT)
set_wolfssl_definitions("HAVE_TLS_EXTENSIONS" RESUlT) set_wolfssl_definitions("HAVE_TLS_EXTENSIONS" RESULT)
set_wolfssl_definitions("OPENSSL_EXTRA" RESUlT) set_wolfssl_definitions("OPENSSL_EXTRA" RESULT)
else() else()
message(STATUS "Checking OQS - not found") message(STATUS "Checking OQS - not found")
@@ -617,20 +622,41 @@ if (WOLFSSL_EXPERIMENTAL)
message(STATUS "Looking for WOLFSSL_OQS - not found") message(STATUS "Looking for WOLFSSL_OQS - not found")
endif() endif()
# Checking for experimental feature: Kyber # Checking for experimental feature: WOLFSSL_MLKEM
message(STATUS "Looking for WOLFSSL_KYBER") message(STATUS "Looking for WOLFSSL_MLKEM")
if (WOLFSSL_KYBER) if (WOLFSSL_MLKEM)
set(WOLFSSL_FOUND_EXPERIMENTAL_FEATURE 1) set(WOLFSSL_FOUND_EXPERIMENTAL_FEATURE 1)
message(STATUS "Automatically set related requirements for Kyber:") message(STATUS "Automatically set related requirements for ML-KEM:")
set_wolfssl_definitions("WOLFSSL_HAVE_MLKEM" RESUlT) add_definitions("-DWOLFSSL_HAVE_MLKEM")
set_wolfssl_definitions("WOLFSSL_WC_MLKEM" RESUlT) add_definitions("-DWOLFSSL_WC_MLKEM")
set_wolfssl_definitions("WOLFSSL_SHA3" RESUlT) add_definitions("-DWOLFSSL_SHA3")
set_wolfssl_definitions("WOLFSSL_SHAKE128" RESUlT) add_definitions("-DWOLFSSL_SHAKE128")
set_wolfssl_definitions("WOLFSSL_SHAKE256" RESUlT) add_definitions("-DWOLFSSL_SHAKE256")
message(STATUS "Looking for WOLFSSL_KYBER - found")
set_wolfssl_definitions("WOLFSSL_HAVE_MLKEM" RESULT)
set_wolfssl_definitions("WOLFSSL_WC_MLKEM" RESULT)
set_wolfssl_definitions("WOLFSSL_SHA3" RESULT)
set_wolfssl_definitions("WOLFSSL_SHAKE128" RESULT)
set_wolfssl_definitions("WOLFSSL_SHAKE256" RESULT)
message(STATUS "Looking for WOLFSSL_MLKEM - found")
else() else()
message(STATUS "Looking for WOLFSSL_KYBER - not found") message(STATUS "Looking for WOLFSSL_MLKEM - not found")
endif()
# Checking for experimental feature: WOLFSSL_LMS
message(STATUS "Looking for WOLFSSL_LMS")
if (WOLFSSL_LMS)
set(WOLFSSL_FOUND_EXPERIMENTAL_FEATURE 2)
message(STATUS "Automatically set related requirements for LMS")
add_definitions("-DWOLFSSL_HAVE_LMS")
add_definitions("-DWOLFSSL_WC_LMS")
set_wolfssl_definitions("WOLFSSL_HAVE_LMS" RESULT)
set_wolfssl_definitions("WOLFSSL_WC_LMS" RESULT)
message(STATUS "Looking for WOLFSSL_LMS - found")
else()
message(STATUS "Looking for WOLFSSL_LMS - not found")
endif() endif()
# Other experimental feature detection can be added here... # Other experimental feature detection can be added here...
@@ -643,8 +669,8 @@ if (WOLFSSL_EXPERIMENTAL)
endif() endif()
# Sanity checks # Sanity checks
if(WOLFSSL_OQS AND WOLFSSL_KYBER) if(WOLFSSL_OQS AND WOLFSSL_MLKEM)
message(FATAL_ERROR "Error: cannot enable both WOLFSSL_OQS and WOLFSSL_KYBER at the same time.") message(FATAL_ERROR "Error: cannot enable both WOLFSSL_OQS and WOLFSSL_MLKEM at the same time.")
endif() endif()
else() else()
@@ -653,8 +679,8 @@ else()
if (WOLFSSL_OQS) if (WOLFSSL_OQS)
message(FATAL_ERROR "Error: WOLFSSL_OQS requires WOLFSSL_EXPERIMENTAL at this time.") message(FATAL_ERROR "Error: WOLFSSL_OQS requires WOLFSSL_EXPERIMENTAL at this time.")
endif() endif()
if(WOLFSSL_KYBER) if(WOLFSSL_MLKEM)
message(FATAL_ERROR "Error: WOLFSSL_KYBER requires WOLFSSL_EXPERIMENTAL at this time.") message(FATAL_ERROR "Error: WOLFSSL_MLKEM requires WOLFSSL_EXPERIMENTAL at this time.")
endif() endif()
endif() endif()

10
cmake/functions.cmake
View File

@@ -198,14 +198,14 @@ function(generate_build_flags)
if(WOLFSSL_XCHACHA OR WOLFSSL_USER_SETTINGS) if(WOLFSSL_XCHACHA OR WOLFSSL_USER_SETTINGS)
set(BUILD_XCHACHA "yes" PARENT_SCOPE) set(BUILD_XCHACHA "yes" PARENT_SCOPE)
endif() endif()
if(WOLFSSL_KYBER OR WOLFSSL_USER_SETTINGS) if(WOLFSSL_MLKEM OR WOLFSSL_USER_SETTINGS)
set(BUILD_WC_KYBER "yes" PARENT_SCOPE) set(BUILD_WC_MLKEM "yes" PARENT_SCOPE)
endif() endif()
if(WOLFSSL_OQS OR WOLFSSL_USER_SETTINGS) if(WOLFSSL_OQS OR WOLFSSL_USER_SETTINGS)
set(BUILD_FALCON "yes" PARENT_SCOPE) set(BUILD_FALCON "yes" PARENT_SCOPE)
set(BUILD_SPHINCS "yes" PARENT_SCOPE) set(BUILD_SPHINCS "yes" PARENT_SCOPE)
set(BUILD_DILITHIUM "yes" PARENT_SCOPE) set(BUILD_DILITHIUM "yes" PARENT_SCOPE)
set(BUILD_EXT_KYBER "yes" PARENT_SCOPE) set(BUILD_EXT_MLKEM "yes" PARENT_SCOPE)
set(BUILD_OQS_HELPER "yes" PARENT_SCOPE) set(BUILD_OQS_HELPER "yes" PARENT_SCOPE)
endif() endif()
if(WOLFSSL_LMS OR WOLFSSL_USER_SETTINGS) if(WOLFSSL_LMS OR WOLFSSL_USER_SETTINGS)
@@ -811,7 +811,7 @@ function(generate_lib_src_list LIB_SOURCES)
list(APPEND LIB_SOURCES wolfcrypt/src/dilithium.c) list(APPEND LIB_SOURCES wolfcrypt/src/dilithium.c)
endif() endif()
if(BUILD_WC_KYBER) if(BUILD_WC_MLKEM)
list(APPEND LIB_SOURCES wolfcrypt/src/wc_mlkem.c) list(APPEND LIB_SOURCES wolfcrypt/src/wc_mlkem.c)
list(APPEND LIB_SOURCES wolfcrypt/src/wc_mlkem_poly.c) list(APPEND LIB_SOURCES wolfcrypt/src/wc_mlkem_poly.c)
@@ -820,7 +820,7 @@ function(generate_lib_src_list LIB_SOURCES)
endif() endif()
endif() endif()
if(BUILD_EXT_KYBER) if(BUILD_EXT_MLKEM)
list(APPEND LIB_SOURCES wolfcrypt/src/ext_mlkem.c) list(APPEND LIB_SOURCES wolfcrypt/src/ext_mlkem.c)
endif() endif()