Give the examples Makefiles a consistent wolfSSL prefix

aidangarske · aidangarske · commit e1d9831c5a77 · 2026-07-14T17:57:29.000-07:00
diff --git a/SGX_Linux/sgx_t.mk b/SGX_Linux/sgx_t.mk
@@ -86,7 +86,7 @@ Wolfssl_Enclave_C_Flags := $(Flags_Just_For_C) $(Common_C_Cpp_Flags) $(Wolfssl_C
 Wolfssl_Enclave_Link_Flags := $(SGX_COMMON_CFLAGS) -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles -L$(SGX_LIBRARY_PATH) \
 	-L$(SGX_WOLFSSL_LIB) -lwolfssl.sgx.static.lib \
 	-Wl,--whole-archive -l$(Trts_Library_Name) -Wl,--no-whole-archive \
-	-Wl,--start-group -lsgx_tstdc -lsgx_tstdcxx -l$(Crypto_Library_Name) -l$(Service_Library_Name) -Wl,--end-group \
+	-Wl,--start-group -lsgx_tstdc -lsgx_tcxx -l$(Crypto_Library_Name) -l$(Service_Library_Name) -Wl,--end-group \
 	-Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined \
 	-Wl,-pie,-eenclave_entry -Wl,--export-dynamic  \
 	-Wl,--defsym,__ImageBase=0 \
diff --git a/X9.146/Makefile b/X9.146/Makefile
@@ -1,4 +1,4 @@
-CC=gcc
+# X9.146 Examples Makefile
 #if you installed wolfssl to an alternate location use CFLAGS and LIBS to
 #control your build:
 
diff --git a/can-bus/Makefile b/can-bus/Makefile
@@ -1,6 +1,7 @@
 CC=gcc
-LIBS=-lwolfssl
-CFLAGS=-g -Wno-cpp -Wall -Wextra -Wpedantic -Wdeclaration-after-statement
+WOLFSSL_INSTALL_DIR=/usr/local
+LIBS=-L$(WOLFSSL_INSTALL_DIR)/lib -lwolfssl
+CFLAGS=-g -Wno-cpp -Wall -Wextra -Wpedantic -Wdeclaration-after-statement -I$(WOLFSSL_INSTALL_DIR)/include
 
 COMMON_OBJS=common.o
 CLIENT_OBJS=client.o
diff --git a/certgen/Makefile b/certgen/Makefile
@@ -1,4 +1,4 @@
-CC=gcc
+# CertGen Examples Makefile
 #if you installed wolfssl to an alternate location use CFLAGS and LIBS to
 #control your build:
 
diff --git a/certmanager/README.md b/certmanager/README.md
@@ -86,7 +86,7 @@ openssl ocsp -port 22221 -ndays 365 \
 From the `wolfssl-examples/certmanager` directory:
 
 ```bash
-./certverify_crl_ocsp
+./certverify_ocsp
 ```
 
 ### Expected Output
diff --git a/certvfy/Makefile b/certvfy/Makefile
@@ -1,6 +1,7 @@
 CC=gcc -g
-CFLAGS=-Wall
-LIBS= -lwolfssl
+WOLFSSL_INSTALL_DIR=/usr/local
+CFLAGS=-Wall -I$(WOLFSSL_INSTALL_DIR)/include
+LIBS= -L$(WOLFSSL_INSTALL_DIR)/lib -lwolfssl
 
 all: certvfy certsigvfy sigvfycert
 
diff --git a/crypto/keywrap/Makefile b/crypto/keywrap/Makefile
@@ -0,0 +1,15 @@
+CC=gcc
+CFLAGS=-Wall
+WOLFSSL_INSTALL_DIR=/usr/local
+CFLAGS+=-I$(WOLFSSL_INSTALL_DIR)/include
+LIBS=-L$(WOLFSSL_INSTALL_DIR)/lib -lwolfssl -lm
+
+all: keywrap
+
+keywrap: keywrap.o
+	$(CC) -o $@ $^ $(CFLAGS) $(LIBS)
+
+.PHONY: clean all
+
+clean:
+	rm -f *.o keywrap
diff --git a/ebpf/tls-uprobe-trace/Makefile b/ebpf/tls-uprobe-trace/Makefile
@@ -1,6 +1,8 @@
 CC      = gcc
 CLANG   = clang
-CFLAGS  = -O2 -g -Wall
+WOLFSSL_INSTALL_DIR = /usr/local
+CFLAGS  = -O2 -g -Wall -I$(WOLFSSL_INSTALL_DIR)/include
+WOLFSSL_LIBS = -L$(WOLFSSL_INSTALL_DIR)/lib -lwolfssl
 
 # Auto-detect host arch, convert to BPF target name
 UNAME_M := $(shell uname -m)
@@ -25,10 +27,10 @@ all: $(TARGETS)
 
 # ===== TLS Programs =====
 client-tls: client-tls.c
-	$(CC) $(CFLAGS) $< -o $@ -lwolfssl
+	$(CC) $(CFLAGS) $< -o $@ $(WOLFSSL_LIBS)
 
 server-tls: server-tls.c
-	$(CC) $(CFLAGS) $< -o $@ -lwolfssl
+	$(CC) $(CFLAGS) $< -o $@ $(WOLFSSL_LIBS)
 
 # ===== eBPF Program =====
 wolfssl_uprobe.bpf.o: wolfssl_uprobe.bpf.c
diff --git a/embedded/Makefile b/embedded/Makefile
@@ -1,4 +1,4 @@
-# TLS Examples Makefile
+# Embedded Examples Makefile
 CC       = gcc
 WOLFSSL_INSTALL_DIR = /usr/local
 CFLAGS   = -Wall -I$(WOLFSSL_INSTALL_DIR)/include
@@ -22,9 +22,7 @@ LIBS+=$(DYN_LIB)
 # build targets
 SRC=$(wildcard *.c)
 TARGETS=$(patsubst %.c, %, $(SRC))
-LINUX_SPECIFIC=client-tls-perf \
-	server-tls-epoll-perf \
-	server-tls-epoll-threaded
+LINUX_SPECIFIC=
 
 
 # Intel QuickAssist
diff --git a/pk/srp/Makefile b/pk/srp/Makefile
@@ -1,5 +1,5 @@
 CC=gcc
-WOLFSSL_INSTALL_DIR=/usr/local/lib
+WOLFSSL_INSTALL_DIR=/usr/local
 CFLAGS=-Wall -I$(WOLFSSL_INSTALL_DIR)/include -g
 #LIBS= -lwolfssl -lm
 LIBS= -L$(WOLFSSL_INSTALL_DIR)/lib -lwolfssl -lm
diff --git a/pkcs11/Makefile b/pkcs11/Makefile
@@ -1,4 +1,4 @@
-# ECC Examples Makefile
+# PKCS11 Examples Makefile
 CC       = gcc
 WOLFSSL_INSTALL_DIR = /usr/local
 CFLAGS   = -Wall -I$(WOLFSSL_INSTALL_DIR)/include
diff --git a/pkcs7/Makefile b/pkcs7/Makefile
@@ -1,9 +1,10 @@
-# ECC Examples Makefile
+# PKCS7 Examples Makefile
 CC       = gcc
 WOLFSSL_INSTALL_DIR = /usr/local
 CFLAGS   = -Wall -I$(WOLFSSL_INSTALL_DIR)/include
+# only needed when linking wolfSSL statically; a shared libwolfssl built
+# --with-libz already carries its own dependency on libz
 ZLIB     =
-#ZLIB    += -lz
 PSA_LIB  = -lmbedcrypto
 LIBS     = -L$(WOLFSSL_INSTALL_DIR)/lib -lm ${ZLIB}
 
diff --git a/pq/ml_dsa/Makefile b/pq/ml_dsa/Makefile
@@ -15,4 +15,4 @@ ml_dsa_test: ml_dsa.c
 .PHONY: clean all
 
 clean:
-	rm -f *.o wolfssl_acert ml_dsa_test
+	rm -f *.o ml_dsa_test
diff --git a/pq/ml_kem/Makefile b/pq/ml_kem/Makefile
@@ -0,0 +1,18 @@
+CC = gcc
+
+WOLFSSL_INSTALL_DIR = /usr/local
+
+WOLFSSL_CFLAGS = -Wextra -Werror -Wall -I$(WOLFSSL_INSTALL_DIR)/include
+WOLFSSL_LIBS   = -L$(WOLFSSL_INSTALL_DIR)/lib -lm -lwolfssl
+
+DEBUG_FLAGS    = -g -DDEBUG
+
+all: ml_kem
+
+ml_kem: ml_kem.c
+	$(CC) -o $@ $^ $(WOLFSSL_CFLAGS) $(WOLFSSL_LIBS) $(DEBUG_FLAGS)
+
+.PHONY: clean all
+
+clean:
+	rm -f *.o ml_kem
diff --git a/psa/Makefile b/psa/Makefile
@@ -1,6 +1,6 @@
 CC       = gcc
 WOLFSSL_INSTALL_DIR = /usr/local
-CFLAGS   ?= -Wall -I$(INCLUDE_PATH)
+CFLAGS   ?= -Wall -I$(WOLFSSL_INSTALL_DIR)/include
 LIBS     ?= -L$(WOLFSSL_INSTALL_DIR)/lib -lm
 
 # PSA implementation
@@ -20,7 +20,10 @@ CFLAGS+=$(OPTIMIZE)
 #LIBS+=$(STATIC_LIB)
 LIBS+=$(DYN_LIB)
 
+# an empty PSA_INCLUDE would leave a bare -I that swallows the next flag
+ifneq ($(PSA_INCLUDE),)
 CFLAGS += -I$(PSA_INCLUDE)
+endif
 LIBS += $(PSA_WOLFSSL_INSTALL_DIR)
 
 TARGETS=client-tls13-ecc-psa server-tls13-ecc-psa
diff --git a/signature/sigtest/Makefile b/signature/sigtest/Makefile
@@ -2,11 +2,18 @@ CC=gcc
 CFLAGS=-Wall
 LIBS=
 
-OPENSSL_DIR=/usr/local/opt
-OPENSSL_FLAGS=-I$(OPENSSL_DIR)/openssl/include
-WOLFSSL_FLAGS=
-OPENSSL_LIB=-L$(OPENSSL_DIR)/openssl/lib -lcrypto -lssl
+# set OPENSSL_DIR only for a non-system OpenSSL (e.g. Homebrew: /usr/local/opt/openssl)
+OPENSSL_DIR ?=
+ifneq ($(OPENSSL_DIR),)
+OPENSSL_FLAGS=-I$(OPENSSL_DIR)/include
+OPENSSL_LIB=-L$(OPENSSL_DIR)/lib -lcrypto -lssl
+else
+OPENSSL_FLAGS=
+OPENSSL_LIB=-lcrypto -lssl
+endif
+
 WOLFSSL_INSTALL_DIR = /usr/local
+WOLFSSL_FLAGS=-I$(WOLFSSL_INSTALL_DIR)/include
 WOLFSSL_LIB= -L$(WOLFSSL_INSTALL_DIR)/lib -lwolfssl
 
 all:wolfsigtest opensigtest eccsiglentest
diff --git a/staticmemory/Makefile b/staticmemory/Makefile
@@ -1,4 +1,4 @@
-# ECC Examples Makefile
+# Static Memory Examples Makefile
 CC       = gcc
 WOLFSSL_INSTALL_DIR = /usr/local
 CFLAGS   = -Wall -I$(WOLFSSL_INSTALL_DIR)/include
diff --git a/staticmemory/memory-bucket-optimizer/optimizer/Makefile b/staticmemory/memory-bucket-optimizer/optimizer/Makefile
@@ -19,7 +19,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
 
 CC = gcc
-LDFLAGS = -lwolfssl
+WOLFSSL_INSTALL_DIR = /usr/local
+CFLAGS += -I$(WOLFSSL_INSTALL_DIR)/include
+LDFLAGS = -L$(WOLFSSL_INSTALL_DIR)/lib -lwolfssl
 
 all: memory_bucket_optimizer
 
diff --git a/staticmemory/memory-bucket-optimizer/tester/Makefile b/staticmemory/memory-bucket-optimizer/tester/Makefile
@@ -19,8 +19,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
 
 CC = gcc
+WOLFSSL_INSTALL_DIR = /usr/local
 CFLAGS = -Wall -Wextra -O2 -g
-LIBS = -lwolfssl
+INCLUDES = -I$(WOLFSSL_INSTALL_DIR)/include
+LIBS = -L$(WOLFSSL_INSTALL_DIR)/lib -lwolfssl
 
 TARGET = memory_bucket_tester
 SOURCE = memory_bucket_tester.c
diff --git a/uefi-static/Makefile b/uefi-static/Makefile
@@ -8,7 +8,10 @@ CFLAGS+=-I./wolfssl/ -I. -I/usr/include/efi
 CFLAGS+=-ggdb
 CC=gcc
 LD=ld
-LDFLAGS_START=-static -pie --no-dynamic-linker -Bsymbolic -L/usr/lib -L/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/ -Lgnu-efi-dir/x86_64/gnuefi -T/usr/lib/elf_x86_64_efi.lds /usr/lib/crt0-efi-x86_64.o $(LDFLAGS)
+# libgcc and gnu-efi sit at different paths per distro (Arch: /usr/lib; Debian/Ubuntu: /usr/lib/<triplet>/gnuefi)
+GCC_LIBDIR := $(shell dirname `$(CC) -print-libgcc-file-name`)
+EFI_LIBDIR := $(firstword $(wildcard /usr/lib/x86_64-linux-gnu/gnuefi /usr/lib64/gnuefi /usr/lib))
+LDFLAGS_START=-static -pie --no-dynamic-linker -Bsymbolic -L/usr/lib -L$(GCC_LIBDIR) -Lgnu-efi-dir/x86_64/gnuefi -T$(EFI_LIBDIR)/elf_x86_64_efi.lds $(EFI_LIBDIR)/crt0-efi-x86_64.o $(LDFLAGS)
 LDFLAGS_END=-lgnuefi -lefi -lgcc
 
 _OBJS=sha256.o sha3.o misc.o coding.o hmac.o rsa.o random.o wolfmath.o		\

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-CC=gcc`
	`1`	`+# X9.146 Examples Makefile`
`2`	`2`	`#if you installed wolfssl to an alternate location use CFLAGS and LIBS to`
`3`	`3`	`#control your build:`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-CC=gcc`
	`1`	`+# CertGen Examples Makefile`
`2`	`2`	`#if you installed wolfssl to an alternate location use CFLAGS and LIBS to`
`3`	`3`	`#control your build:`
`4`	`4`