Skip to content

Commit a125326

Browse files
committed
Merge branch 'fix/remove_mbedtls_gcc_15_cflag' into 'master'
fix(mbedtls): remove Wunterminated-string-initialization Closes IDF-13375 See merge request espressif/esp-idf!40362
2 parents 0fde8d2 + 7c79237 commit a125326

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

components/mbedtls/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -357,11 +357,6 @@ foreach(target ${mbedtls_targets})
357357
endif()
358358
endforeach()
359359

360-
if(CMAKE_C_COMPILER_ID MATCHES "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER 15.0)
361-
target_compile_options(mbedtls PRIVATE "-Wno-unterminated-string-initialization")
362-
endif()
363-
364-
365360
if(CONFIG_MBEDTLS_DYNAMIC_BUFFER)
366361
set(WRAP_FUNCTIONS
367362
mbedtls_ssl_write_client_hello

components/mbedtls/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,8 +368,8 @@ menu "mbedTLS"
368368
config keeps expired, retracted certificates in the bundle and it may
369369
pose a security risk.
370370

371-
- Deprecated cert list may grow based based on sync with upstream bundle
372-
- Deprecated certs would be be removed in ESP-IDF (next) major release
371+
- Deprecated cert list may grow based on sync with upstream bundle
372+
- Deprecated certs would be removed in ESP-IDF (next) major release
373373

374374
config MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS
375375
int "Maximum no of certificates allowed in certificate bundle"

0 commit comments

Comments
 (0)