From b093b0736da6df05c87bc3c69aa5675acbdac8dc Mon Sep 17 00:00:00 2001 From: JasonFreeLab <1578989199@qq.com> Date: Wed, 26 Jul 2023 23:27:04 +0800 Subject: [PATCH 1/5] partition.c add ".c" in 1st line. --- components/spi_flash/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/spi_flash/CMakeLists.txt b/components/spi_flash/CMakeLists.txt index 255eff8e7..287e63c13 100644 --- a/components/spi_flash/CMakeLists.txt +++ b/components/spi_flash/CMakeLists.txt @@ -1,4 +1,4 @@ -set(srcs "src/partition" +set(srcs "src/partition.c" "src/spi_flash_raw.c" "src/spi_flash.c") if(BOOTLOADER_BUILD) From d9491467d243f823aa2129569602cc68de94d8f3 Mon Sep 17 00:00:00 2001 From: JasonFreeLab <1578989199@qq.com> Date: Mon, 31 Jul 2023 11:43:04 +0800 Subject: [PATCH 2/5] add submodule wolfssl --- .gitmodules | 4 ++++ components/wolfssl | 1 + 2 files changed, 5 insertions(+) create mode 160000 components/wolfssl diff --git a/.gitmodules b/.gitmodules index d36acbfe5..a7f9718ae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,3 +17,7 @@ [submodule "components/coap/libcoap"] path = components/coap/libcoap url = ../../obgm/libcoap.git + +[submodule "components/wolfssl"] + path = components/wolfssl + url = ../wolfssl.git diff --git a/components/wolfssl b/components/wolfssl new file mode 160000 index 000000000..9517b7b5a --- /dev/null +++ b/components/wolfssl @@ -0,0 +1 @@ +Subproject commit 9517b7b5a861428890da6442b9314494049d74ab From 3b3a016d215397667f00c7be8eb615b5545d89ef Mon Sep 17 00:00:00 2001 From: JasonFreeLab <1578989199@qq.com> Date: Mon, 31 Jul 2023 16:23:18 +0800 Subject: [PATCH 3/5] update wolfssl --- components/wolfssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/wolfssl b/components/wolfssl index 9517b7b5a..e6d3b09a3 160000 --- a/components/wolfssl +++ b/components/wolfssl @@ -1 +1 @@ -Subproject commit 9517b7b5a861428890da6442b9314494049d74ab +Subproject commit e6d3b09a3eaf91a5094d2cdbc6a615703f2fd1f2 From d41db2232493e660b1f35a9d9f4d6a4124d3ed55 Mon Sep 17 00:00:00 2001 From: JasonFreeLab <1578989199@qq.com> Date: Mon, 6 Nov 2023 13:26:02 +0800 Subject: [PATCH 4/5] update --- components/esp-tls/CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/components/esp-tls/CMakeLists.txt b/components/esp-tls/CMakeLists.txt index 199c554ad..1b1b924d2 100644 --- a/components/esp-tls/CMakeLists.txt +++ b/components/esp-tls/CMakeLists.txt @@ -12,10 +12,14 @@ endif() idf_component_register(SRCS "${srcs}" INCLUDE_DIRS "." PRIV_INCLUDE_DIRS "private_include" - REQUIRES mbedtls + REQUIRES mbedtls wolfssl PRIV_REQUIRES lwip http_parser) if(CONFIG_ESP_TLS_USING_WOLFSSL) - idf_component_get_property(wolfssl esp-wolfssl COMPONENT_LIB) - target_link_libraries(${COMPONENT_LIB} PUBLIC ${wolfssl}) + if(CONFIG_ESP_WOLFSSL_INTERNAL) + idf_component_get_property(wolfssl esp-wolfssl COMPONENT_LIB) + target_link_libraries(${COMPONENT_LIB} PUBLIC ${wolfssl}) + elseif(CONFIG_TLS_STACK_WOLFSSL) + component_compile_options("-DWOLFSSL_USER_SETTINGS") + endif() endif() From c6bcdf6a826b599b81886f68ba4a0ef02556b30a Mon Sep 17 00:00:00 2001 From: JasonFreeLab <1578989199@qq.com> Date: Mon, 6 Nov 2023 14:33:29 +0800 Subject: [PATCH 5/5] update wolfssl --- components/wolfssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/wolfssl b/components/wolfssl index e6d3b09a3..ec5c7872b 160000 --- a/components/wolfssl +++ b/components/wolfssl @@ -1 +1 @@ -Subproject commit e6d3b09a3eaf91a5094d2cdbc6a615703f2fd1f2 +Subproject commit ec5c7872bc1030f9c1c231ec229130c05370434b