From 1970fec1908a02df3d37918d50452e831c347fbf Mon Sep 17 00:00:00 2001 From: Eric Blankenhorn Date: Mon, 17 Feb 2025 08:17:05 -0600 Subject: [PATCH 1/2] Fix cmake lean_tls build --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fcc5477a06..128cd45814 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1141,8 +1141,7 @@ if(NOT WOLFSSL_MEMORY) else() # turn off memory cb if leanpsk or leantls on if(WOLFSSL_LEAN_PSK OR WOLFSSL_LEAN_TLS) - # but don't turn on NO_WOLFSSL_MEMORY because using own - override_cache(WOLFSSL_MEMORY "no") + list(APPEND WOLFSSL_DEFINITIONS "-DNO_WOLFSSL_MEMORY") endif() endif() From bc79803c1a377f44df36a0b607e4a6f9456fb70b Mon Sep 17 00:00:00 2001 From: Eric Blankenhorn Date: Mon, 17 Feb 2025 15:16:29 -0600 Subject: [PATCH 2/2] Add workflow test --- .github/workflows/cmake.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index a2ae9cff44..cc8ab5f408 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -83,5 +83,25 @@ jobs: cmake --build . cmake --install . + # clean up + cd .. + rm -rf build + # Kyber Cmake broken # -DWOLFSSL_KYBER:BOOL=yes + +# build "lean-tls" wolfssl + - name: Build wolfssl with lean-tls + working-directory: ./wolfssl + run: | + mkdir build + cd build + cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DWOLFSSL_INSTALL=yes -DCMAKE_INSTALL_PREFIX="$GITHUB_WORKSPACE/install" \ + -DWOLFSSL_LEAN_TLS:BOOL=yes \ + .. + cmake --build . + cmake --install . + + # clean up + cd .. + rm -rf build