Use patched mbedtls

canokeys · May 25, 2020 · 9cb53a6 · 9cb53a6
1 parent 3cfe49d
commit 9cb53a6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,11 @@ if (USE_MBEDCRYPTO)
     set(USE_CRYPTO_SUBMODULE ON CACHE BOOL "")
     set(ENABLE_PROGRAMS OFF CACHE BOOL "")
     set(ENABLE_TESTING OFF CACHE BOOL "") # disable mbedtls tests
-    add_subdirectory(mbedtls)
+    file(COPY mbedtls DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/patched)
+    execute_process(COMMAND patch -p1 -u
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/patched/mbedtls
+        INPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/mbedtls-ed25519.patch)
+    add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/patched/mbedtls)
 endif (USE_MBEDCRYPTO)
 
 file(GLOB SRC src/*.c)
@@ -22,7 +26,7 @@ if (USE_MBEDCRYPTO)
     target_link_libraries(canokey-crypto mbedcrypto)
 endif (USE_MBEDCRYPTO)
 target_include_directories(canokey-crypto PUBLIC include)
-target_include_directories(canokey-crypto PRIVATE mbedtls/include)
+target_include_directories(canokey-crypto PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/patched/mbedtls/include)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
 

diff --git a/mbedtls b/mbedtls