From 0fb83c3f85c33310882c2f1971e5b6d0ba8e26b9 Mon Sep 17 00:00:00 2001 From: pedro Date: Sat, 13 Jul 2024 14:50:16 +0200 Subject: [PATCH] build: add wolfssl support for httpd --- release/src-rt-6.x.4708/router/httpd/Makefile | 13 +++++++++---- release/src-rt-6.x.4708/router/httpd/httpd.c | 2 +- release/src-rt-6.x.4708/router/httpd/webio.c | 6 +++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/release/src-rt-6.x.4708/router/httpd/Makefile b/release/src-rt-6.x.4708/router/httpd/Makefile index 7fb1bd8746..993cb1dcc7 100644 --- a/release/src-rt-6.x.4708/router/httpd/Makefile +++ b/release/src-rt-6.x.4708/router/httpd/Makefile @@ -11,10 +11,15 @@ ifeq ($(TCONFIG_BCMARM),y) endif ifneq ($(TCONFIG_HTTPS),) - CFLAGS += -I$(TOP)/$(OPENSSLDIR)/include - CFLAGS += -I$(TOP)/mssl -DUSE_OPENSSL - LDFLAGS += -L$(TOP)/mssl -L$(TOP)/$(OPENSSLDIR) - LIBS += -lmssl -lssl -lcrypto + ifeq ($(TCONFIG_WOLFSSL),y) + CFLAGS += -DUSE_WOLFSSL -I$(TOP)/mssl -I$(TOP)/wolfssl/staged/usr/include -I$(TOP)/wolfssl/staged/usr/include/wolfssl + LDFLAGS += -L$(TOP)/mssl -L$(TOP)/wolfssl/staged/usr/lib + LIBS += -lmssl -lwolfssl + else + CFLAGS += -DUSE_OPENSSL -I$(TOP)/mssl -I$(TOP)/$(OPENSSLDIR)/include + LDFLAGS += -L$(TOP)/mssl -L$(TOP)/$(OPENSSLDIR) + LIBS += -lmssl -lssl -lcrypto + endif endif ifeq ($(TOMATO_EXPERIMENTAL),1) diff --git a/release/src-rt-6.x.4708/router/httpd/httpd.c b/release/src-rt-6.x.4708/router/httpd/httpd.c index 4028b515af..fb3e6d558a 100644 --- a/release/src-rt-6.x.4708/router/httpd/httpd.c +++ b/release/src-rt-6.x.4708/router/httpd/httpd.c @@ -72,7 +72,7 @@ #include #include "tomato.h" #ifdef TCONFIG_HTTPS -#include "../mssl/mssl.h" +#include "mssl.h" #ifdef USE_OPENSSL #include #endif diff --git a/release/src-rt-6.x.4708/router/httpd/webio.c b/release/src-rt-6.x.4708/router/httpd/webio.c index a2e6fb6ab0..1825dc7dba 100644 --- a/release/src-rt-6.x.4708/router/httpd/webio.c +++ b/release/src-rt-6.x.4708/router/httpd/webio.c @@ -3,11 +3,15 @@ * Tomato Firmware * Copyright (C) 2006-2009 Jonathan Zarate * + * Fixes/updates (C) 2018 - 2024 pedro + * */ #include "tomato.h" -#include "../mssl/mssl.h" +#ifdef TCONFIG_HTTPS + #include "mssl.h" +#endif #include #include