Skip to content

Commit 5fd7b2b

Browse files
authored
Merge pull request #124 from billphipps/fix-clang-warnings
Add heirarchical makefiles, update .gitignores, fix missing init in rsa benchmark
2 parents fda4b62 + a771d86 commit 5fd7b2b

File tree

7 files changed

+64
-1
lines changed

7 files changed

+64
-1
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ Build/
66
**/.gdb_history
77
tools/testcertgen/ca/
88
tools/testcertgen/*.der
9+
*.code-workspace
10+
.vscode
911

Makefile

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
.PHONY: all test benchmark tools examples clean
3+
4+
all: test benchmark tools examples
5+
6+
test:
7+
make -C test
8+
9+
benchmark:
10+
make -C benchmark
11+
12+
tools:
13+
make -C tools
14+
15+
examples:
16+
make -C examples
17+
18+
clean:
19+
make -C test clean
20+
make -C benchmark clean
21+
make -C tools clean
22+
make -C examples clean

benchmark/bench_modules/wh_bench_mod_rsa.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ int _benchRsaCrypt(whClientContext* client, whBenchOpContext* ctx, int id,
406406
}
407407

408408
for (i = 0; i < WOLFHSM_CFG_BENCH_PK_ITERS && ret == 0; i++) {
409-
int benchStartRet;
409+
int benchStartRet = 0;
410410
int benchStopRet;
411411
int opRet;
412412

examples/Makefile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2+
.PHONY: all posix_tcp_wh_client_tcp posix_tcp_wh_server_tcp clean
3+
4+
all: posix_tcp_wh_client_tcp posix_tcp_wh_server_tcp
5+
6+
posix_tcp_wh_client_tcp:
7+
make -C posix/tcp/wh_client_tcp
8+
9+
posix_tcp_wh_server_tcp:
10+
make -C posix/tcp/wh_server_tcp
11+
12+
clean:
13+
make -C posix/tcp/wh_client_tcp clean
14+
make -C posix/tcp/wh_server_tcp clean
15+

tools/Makefile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
.PHONY: all testcertgen whnvmtool clean
3+
4+
all: whnvmtool
5+
6+
testcertgen:
7+
make -C testcertgen
8+
9+
whnvmtool:
10+
make -C whnvmtool
11+
12+
clean:
13+
make -C testcertgen clean
14+
make -C whnvmtool clean

tools/testcertgen/Makefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
.PHONY: all clean
3+
4+
all:
5+
./gen_acerts.sh
6+
./gen_test_cert_chain.sh
7+
8+
clean:
9+
#TODO

tools/whnvmtool/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ whnvmtool
22
test/test_whnvmtool
33
*.bin
44
*.hex
5+
nvm_metadata.txt

0 commit comments

Comments
 (0)