Remove EverCrypt support

.github/workflows/ci.yml

@@ -69,6 +69,6 @@ jobs:
     - name: Test
       working-directory: ${{github.workspace}}/build/${{ matrix.build_type }}
       shell: bash
-      run: ctest -VV -C ${{ matrix.build_type }}
+      run: ctest -VV -C ${{ matrix.build_type }} --timeout 300
       env: 
         ASAN_OPTIONS: use_sigaltstack=false # To avoid SetAlternateSignalStack with clang-11 

CMakeLists.txt

@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-project(merklecpp LANGUAGES CXX C ASM)
+project(merklecpp LANGUAGES CXX)
 
 cmake_minimum_required(VERSION 3.11)
 set(CMAKE_CXX_STANDARD 17)
@@ -10,7 +10,6 @@ set(MERKLECPP_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 option(PROFILE "enable profiling" OFF)
 option(TESTS "enable testing" OFF)
-option(EVERCRYPT "enable comparison with EverCrypt Merkle trees" OFF)
 option(OPENSSL "enable OpenSSL" OFF)
 option(TRACE "enable debug traces" OFF)
 option(CLANG_TIDY "enable clang-tidy checks during build" OFF)
@@ -33,25 +32,6 @@ install(TARGETS merklecpp)
 
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".so")
 
-if(EVERCRYPT)
-  if(NOT EVERCRYPT_DIR)
-    message(FATAL_ERROR "EverCrypt not found, add -DEVERCRYPT_DIR=...")
-  endif()
-
-  file(GLOB EVERCRYPT_SRC "${EVERCRYPT_DIR}/*.c"
-       "${EVERCRYPT_DIR}/*-x86_64-linux.S"
-  )
-  add_library(evercrypt STATIC ${EVERCRYPT_SRC})
-  target_include_directories(
-    evercrypt PUBLIC ${EVERCRYPT_DIR} ${EVERCRYPT_DIR}/kremlin
-                     ${EVERCRYPT_DIR}/kremlin/kremlib
-  )
-  set_target_properties(evercrypt PROPERTIES LINKER_LANGUAGE C)
-
-  target_compile_definitions(merklecpp INTERFACE HAVE_EVERCRYPT)
-  target_link_libraries(merklecpp INTERFACE evercrypt)
-endif()
-
 if(OPENSSL)
   find_package(OpenSSL)
   target_compile_definitions(merklecpp INTERFACE HAVE_OPENSSL)

test/CMakeLists.txt

@@ -30,13 +30,7 @@ add_merklecpp_test(partial_serialisation partial_serialisation.cpp)
 add_merklecpp_test(serialise_to_file serialise_to_file.cpp)
 add_merklecpp_test(coverage coverage.cpp)
 
-if(TARGET evercrypt.host)
-  add_merklecpp_test(compare_evercrypt compare_evercrypt.cpp)
-endif()
-
-if(OPENSSL
-   OR EVERCRYPT
-)
+if(OPENSSL)
   add_merklecpp_test(compare_hash_functions compare_hash_functions.cpp)
 endif()