Skip to content

Commit 310fe7c

Browse files
committed
Fix spelling error. Fix CMake build broken since cryptocb refactor in PR #304. Added CI tests for CMake.
1 parent 93a2493 commit 310fe7c

3 files changed

Lines changed: 46 additions & 1 deletion

File tree

.github/workflows/cmake-build.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: WolfTPM CMake Build Tests
2+
3+
on:
4+
push:
5+
branches: [ 'master', 'main', 'release/**' ]
6+
pull_request:
7+
branches: [ '*' ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
#pull wolfTPM
16+
- uses: actions/checkout@master
17+
18+
# Install cmake
19+
- name: Install cmake
20+
run: |
21+
sudo apt-get update
22+
sudo apt-get install -y cmake
23+
24+
#pull and build wolfssl
25+
- uses: actions/checkout@master
26+
with:
27+
repository: wolfssl/wolfssl
28+
path: wolfssl
29+
- name: Build wolfssl
30+
working-directory: ./wolfssl
31+
run: |
32+
mkdir build
33+
cd build
34+
cmake -DWOLFSSL_TPM=yes ..
35+
make
36+
sudo make install
37+
38+
#build wolftpm
39+
- name: Build wolfTPM
40+
run: |
41+
mkdir build
42+
cd build
43+
cmake -DWOLFTPM_INTERFACE=SWTPM ..
44+
make

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ set(TPM_SOURCES
3535
src/tpm2_tis.c
3636
src/tpm2_winapi.c
3737
src/tpm2_wrap.c
38+
src/tpm2_cryptocb.c
3839
hal/tpm_io.c
3940
)
4041

examples/run_examples.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fi
3939

4040

4141
# Key Generation Tests
42-
echo -e "Ken Generation Tests"
42+
echo -e "Key Generation Tests"
4343
./examples/keygen/keygen keyblob.bin -rsa >> run.out
4444
RESULT=$?
4545
[ $RESULT -ne 0 ] && echo -e "keygen rsa failed! $RESULT" && exit 1

0 commit comments

Comments
 (0)