diff --git a/modules/tls_wolfssl/Makefile b/modules/tls_wolfssl/Makefile index ebfc5565371..e0c7582b579 100644 --- a/modules/tls_wolfssl/Makefile +++ b/modules/tls_wolfssl/Makefile @@ -32,18 +32,18 @@ lib/wolfssl/Makefile: lib/wolfssl/configure --prefix=$(MOD_DIR)/lib \ --exec-prefix=$(MOD_DIR)/lib \ C_EXTRA_FLAGS="-fPIC" \ - CFLAGS="-DWOLFSSL_STATIC_RSA $(WOLFSSL_EXTRA_CFLAGS)" + CFLAGS="-DWOLFSSL_STATIC_RSA -DOPENSSL_EXTRA $(WOLFSSL_EXTRA_CFLAGS)" -PATCHED_FILES = lib/wolfssl/src/internal.c lib/wolfssl/src/ssl.c +PATCHED_FILES = #lib/wolfssl/src/internal.c lib/wolfssl/src/ssl.c lib/lib/libwolfssl.a: lib/wolfssl/Makefile $(PATCHED_FILES) $(Q)$(MAKE) -C ./lib/wolfssl install -lib/wolfssl/src/internal.c: lib/patches/wolfssl-internal-memleak-fix.patched - -lib/patches/wolfssl-internal-memleak-fix.patched: lib/patches/wolfssl-internal-memleak-fix.diff - $(Q)patch -sNR -p1 -d lib/wolfssl --dry-run < $< || patch -N -p1 -d lib/wolfssl < $< && cp $< $@ - +#lib/wolfssl/src/internal.c: lib/patches/wolfssl-internal-memleak-fix.patched +# +#lib/patches/wolfssl-internal-memleak-fix.patched: lib/patches/wolfssl-internal-memleak-fix.diff +# $(Q)patch -sNR -p1 -d lib/wolfssl --dry-run < $< || patch -N -p1 -d lib/wolfssl < $< && cp $< $@ +# clean: clean-wolfssl-lib .PHONY: clean-wolfssl-lib @@ -51,7 +51,8 @@ clean-wolfssl-lib: -@if [ -f ./lib/wolfssl/Makefile ]; then \ $(MAKE) -C ./lib/wolfssl clean; \ fi; - -@patch -stNR -p1 -d lib/wolfssl < lib/patches/wolfssl-internal-memleak-fix.diff +# -@patch -stNR -p1 -d lib/wolfssl < lib/patches/wolfssl-internal-memleak-fix.diff -@rm -rf ./lib/bin ./lib/include ./lib/lib ./lib/share \ ./lib/wolfssl/Makefile ./lib/wolfssl/configure \ - lib/patches/wolfssl-internal-memleak-fix.patched + +# lib/patches/wolfssl-internal-memleak-fix.patched diff --git a/modules/tls_wolfssl/lib/wolfssl b/modules/tls_wolfssl/lib/wolfssl index 57aac1c50b4..66596ad9e1d 160000 --- a/modules/tls_wolfssl/lib/wolfssl +++ b/modules/tls_wolfssl/lib/wolfssl @@ -1 +1 @@ -Subproject commit 57aac1c50b45275c7a99eca32ad985998b292dc8 +Subproject commit 66596ad9e1d7efa8479656872cf09c9c1870a02e