From 310fe7cd5a12583ef50a41b7f993f4a72d17f01a Mon Sep 17 00:00:00 2001 From: David Garske Date: Fri, 29 Dec 2023 10:36:42 -0800 Subject: [PATCH] Fix spelling error. Fix CMake build broken since cryptocb refactor in PR #304. Added CI tests for CMake. --- .github/workflows/cmake-build.yml | 44 +++++++++++++++++++++++++++++++ CMakeLists.txt | 1 + examples/run_examples.sh | 2 +- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/cmake-build.yml diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml new file mode 100644 index 00000000..158ac5c6 --- /dev/null +++ b/.github/workflows/cmake-build.yml @@ -0,0 +1,44 @@ +name: WolfTPM CMake Build Tests + +on: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: +#pull wolfTPM + - uses: actions/checkout@master + +# Install cmake + - name: Install cmake + run: | + sudo apt-get update + sudo apt-get install -y cmake + +#pull and build wolfssl + - uses: actions/checkout@master + with: + repository: wolfssl/wolfssl + path: wolfssl + - name: Build wolfssl + working-directory: ./wolfssl + run: | + mkdir build + cd build + cmake -DWOLFSSL_TPM=yes .. + make + sudo make install + +#build wolftpm + - name: Build wolfTPM + run: | + mkdir build + cd build + cmake -DWOLFTPM_INTERFACE=SWTPM .. + make diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a9bb724..b1b28770 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,7 @@ set(TPM_SOURCES src/tpm2_tis.c src/tpm2_winapi.c src/tpm2_wrap.c + src/tpm2_cryptocb.c hal/tpm_io.c ) diff --git a/examples/run_examples.sh b/examples/run_examples.sh index e6e3756d..8f4ba757 100755 --- a/examples/run_examples.sh +++ b/examples/run_examples.sh @@ -39,7 +39,7 @@ fi # Key Generation Tests -echo -e "Ken Generation Tests" +echo -e "Key Generation Tests" ./examples/keygen/keygen keyblob.bin -rsa >> run.out RESULT=$? [ $RESULT -ne 0 ] && echo -e "keygen rsa failed! $RESULT" && exit 1