From 388cbf9c5c6b2c2e32e098b8b0403c2da5237d01 Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Mon, 22 Jun 2026 13:56:46 +0100 Subject: [PATCH] Fix wolfSSL interop build by defining WOLFPKCS11_USER_SETTINGS The standalone interoperability test Makefile compiles the wolfPKCS11 sources without running ./configure, so the generated wolfpkcs11/options.h does not exist. Since pkcs11.h now includes unless WOLFPKCS11_USER_SETTINGS is defined, the build failed with a fatal missing-header error. Define WOLFPKCS11_USER_SETTINGS so pkcs11.h includes the local user_settings.h (already on the include path) instead of the generated options.h, restoring the pre-regression build behavior. --- tests/wolfssl-interoperability/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/wolfssl-interoperability/Makefile b/tests/wolfssl-interoperability/Makefile index 0abf3081..06bc49fb 100644 --- a/tests/wolfssl-interoperability/Makefile +++ b/tests/wolfssl-interoperability/Makefile @@ -10,7 +10,7 @@ WOLFPKCS11_DIR ?= ../.. BUILD_DIR := build -COMMON_CPPFLAGS := -DWOLFSSL_USER_SETTINGS -I. -I.. \ +COMMON_CPPFLAGS := -DWOLFSSL_USER_SETTINGS -DWOLFPKCS11_USER_SETTINGS -I. -I.. \ -I$(WOLFSSL_DIR) -I$(WOLFSSL_DIR)/wolfssl -I$(WOLFSSL_DIR)/wolfssl/wolfcrypt \ -I$(WOLFPKCS11_DIR) -I$(WOLFPKCS11_DIR)/wolfpkcs11 -I$(WOLFPKCS11_DIR)/src WOLFCRYPT_CPPFLAGS := $(COMMON_CPPFLAGS) -DWOLFSSL_LIB