Skip to content

Commit df0ea82

Browse files
dgarskedanielinux
authored andcommitted
Improve H5 TLS client to gate on ENABLE_TLS_CLIENT=1
1 parent 9f7848e commit df0ea82

2 files changed

Lines changed: 20 additions & 5 deletions

File tree

src/port/stm32h563/Makefile

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ TZEN ?= 0
1111
# Requires wolfSSL cloned alongside wolfip (or set WOLFSSL_ROOT)
1212
ENABLE_TLS ?= 0
1313

14+
# TLS client test: set ENABLE_TLS_CLIENT=1 to include TLS client (Google test)
15+
# Automatically enables TLS if needed
16+
ENABLE_TLS_CLIENT ?= 0
17+
1418
# HTTPS web server: set ENABLE_HTTPS=1 to include HTTPS web server
1519
# Automatically enables TLS if needed
1620
ENABLE_HTTPS ?= 0
@@ -24,6 +28,9 @@ ENABLE_SSH ?= 0
2428
ENABLE_MQTT ?= 0
2529

2630
# Auto-enable TLS when any feature that requires it is enabled
31+
ifeq ($(ENABLE_TLS_CLIENT),1)
32+
ENABLE_TLS = 1
33+
endif
2734
ifeq ($(ENABLE_HTTPS),1)
2835
ENABLE_TLS = 1
2936
endif
@@ -84,7 +91,11 @@ CFLAGS += -I$(WOLFSSL_ROOT)
8491

8592
# TLS server, client and wolfIP-wolfSSL glue
8693
SRCS += tls_server.c
94+
# TLS client (Google test)
95+
ifeq ($(ENABLE_TLS_CLIENT),1)
96+
CFLAGS += -DENABLE_TLS_CLIENT
8797
SRCS += tls_client.c
98+
endif
8899
SRCS += $(ROOT)/src/port/wolfssl_io.c
89100

90101
# HTTPS web server - uses existing wolfIP httpd
@@ -257,7 +268,7 @@ endif # ENABLE_MQTT_BROKER
257268
OBJS := $(patsubst %.c,%.o,$(SRCS))
258269

259270
all: app.bin
260-
@echo "Built with TZEN=$(TZEN) ENABLE_TLS=$(ENABLE_TLS) ENABLE_HTTPS=$(ENABLE_HTTPS) ENABLE_SSH=$(ENABLE_SSH) ENABLE_MQTT=$(ENABLE_MQTT) ENABLE_MQTT_BROKER=$(ENABLE_MQTT_BROKER)"
271+
@echo "Built with TZEN=$(TZEN) ENABLE_TLS=$(ENABLE_TLS) ENABLE_TLS_CLIENT=$(ENABLE_TLS_CLIENT) ENABLE_HTTPS=$(ENABLE_HTTPS) ENABLE_SSH=$(ENABLE_SSH) ENABLE_MQTT=$(ENABLE_MQTT) ENABLE_MQTT_BROKER=$(ENABLE_MQTT_BROKER)"
261272
ifeq ($(ENABLE_TLS),1)
262273
@echo " wolfSSL: $(WOLFSSL_ROOT)"
263274
endif
@@ -344,6 +355,7 @@ help:
344355
@echo "Options:"
345356
@echo " TZEN=1 Enable TrustZone support"
346357
@echo " ENABLE_TLS=1 Enable TLS server (requires wolfSSL)"
358+
@echo " ENABLE_TLS_CLIENT=1 Enable TLS client test (Google)"
347359
@echo " ENABLE_HTTPS=1 Enable HTTPS web server (requires TLS)"
348360
@echo " ENABLE_SSH=1 Enable SSH server (requires TLS + wolfSSH)"
349361
@echo " ENABLE_MQTT=1 Enable MQTT client (requires TLS + wolfMQTT)"
@@ -359,8 +371,9 @@ help:
359371
@echo " make ENABLE_TLS=1 # TLS echo server (port 8443)"
360372
@echo " make ENABLE_TLS=1 ENABLE_HTTPS=1 # TLS + HTTPS web (port 443)"
361373
@echo " make ENABLE_TLS=1 ENABLE_SSH=1 # TLS + SSH shell (port 22)"
374+
@echo " make ENABLE_TLS=1 ENABLE_TLS_CLIENT=1 # TLS client (Google test)"
362375
@echo " make ENABLE_TLS=1 ENABLE_MQTT=1 # TLS + MQTT client"
363-
@echo " make ENABLE_TLS=1 ENABLE_MQTT_BROKER=1 # TLS + MQTT broker"
376+
@echo " make ENABLE_TLS=1 ENABLE_MQTT_BROKER=1 # TLS + MQTT broker"
364377
@echo " make ENABLE_TLS=1 ENABLE_HTTPS=1 ENABLE_SSH=1 ENABLE_MQTT=1 ENABLE_MQTT_BROKER=1 # Full featured"
365378
@echo ""
366379
@echo "Full Build Command (recommended):"

src/port/stm32h563/main.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
extern volatile unsigned long broker_uptime_sec;
5252
#endif
5353

54-
#ifdef ENABLE_TLS
54+
#ifdef ENABLE_TLS_CLIENT
5555

5656
/* Google IP for TLS client test (run: dig +short google.com) */
5757
#define GOOGLE_IP "142.250.189.174"
@@ -438,7 +438,7 @@ static void eth_gpio_init(void)
438438
gpio_eth_pin(GPIOG_BASE, 13); /* TXD0 */
439439
}
440440

441-
#ifdef ENABLE_TLS
441+
#ifdef ENABLE_TLS_CLIENT
442442
/* Callback for TLS client responses */
443443
static void tls_response_cb(const char *data, int len, void *ctx)
444444
{
@@ -641,11 +641,13 @@ int main(void)
641641
uart_puts("ERROR: TLS server init failed\n");
642642
}
643643

644+
#ifdef ENABLE_TLS_CLIENT
644645
uart_puts("Initializing TLS client...\n");
645646
if (tls_client_init(IPStack, uart_puts) < 0) {
646647
uart_puts("ERROR: TLS client init failed\n");
647648
}
648649
#endif
650+
#endif
649651

650652
#ifdef ENABLE_HTTPS
651653
uart_puts("Initializing HTTPS server on port 443...\n");
@@ -789,7 +791,7 @@ int main(void)
789791
broker_uptime_sec = (unsigned long)(tick / 1000);
790792
#endif
791793

792-
#ifdef ENABLE_TLS
794+
#ifdef ENABLE_TLS_CLIENT
793795
/* TLS client test: connect to Google after network settles */
794796
if (!tls_client_test_started && tick > 5000) {
795797
uart_puts("\n--- TLS Client Test: Connecting to Google ---\n");

0 commit comments

Comments
 (0)