diff --git a/cmake/buildOptions.cmake b/cmake/buildOptions.cmake index 3edfc0d..aa5eedf 100644 --- a/cmake/buildOptions.cmake +++ b/cmake/buildOptions.cmake @@ -80,9 +80,6 @@ if(DEFINED ENABLE_ALL_OT) set(ENABLE_SILENT_VOLE ${ENABLE_ALL_OT} CACHE BOOL "" FORCE) unset(ENABLE_ALL_OT CACHE) - if(ENABLE_IKNP) - set(ENABLE_KOS true) - endif() endif() @@ -132,6 +129,9 @@ endif() option(VERBOSE_FETCH "Print build info for fetched libraries" ON) +if(ENABLE_IKNP) + set(ENABLE_KOS true) +endif() message(STATUS "General Options\n=======================================================") @@ -210,6 +210,10 @@ if ((ENABLE_SIMPLESTOT OR ENABLE_MR OR ENABLE_NP OR ENABLE_MRR) AND NOT (ENABLE_ message(FATAL_ERROR "ENABLE_SIMPLESTOT, ENABLE_MR, ENABLE_NP, and ENABLE_MRR require ENABLE_SODIUM or ENABLE_RELIC") endif() +if(ENABLE_IKNP AND NOT ENABLE_KOS) + message(FATAL_ERROR "ENABLE_IKNP requires ENABLE_KOS") +endif() + #include(${CMAKE_CURRENT_LIST_DIR}/../cryptoTools/cmake/cryptoToolsBuildOptions.cmake) diff --git a/libOTe/Tools/Pprf/RegularPprf.h b/libOTe/Tools/Pprf/RegularPprf.h index 3156986..75a3d73 100644 --- a/libOTe/Tools/Pprf/RegularPprf.h +++ b/libOTe/Tools/Pprf/RegularPprf.h @@ -707,7 +707,6 @@ namespace osuCrypto bool programPuncturedPoint, u64 numThreads, CoeffCtx ctx = {}) - try { MACORO_TRY{ pprf::validateExpandFormat(oFormat, output, mDomain, mPntCount);