Skip to content

Commit

Permalink
IDF release/v4.4 7c986a64c7
Browse files Browse the repository at this point in the history
  • Loading branch information
@me-no-dev
me-no-dev committed Feb 6, 2022
1 parent a675e64 commit b69b44a
Show file tree
Hide file tree
Showing 13 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions platform.txt
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tools/platformio-build-esp32.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@
"UNITY_INCLUDE_CONFIG_H",
"WITH_POSIX",
"_GNU_SOURCE",
("IDF_VER", '\\"v4.4-112-g0a1e309ee4\\"'),
("IDF_VER", '\\"v4.4-114-g7c986a64c7\\"'),
"ESP_PLATFORM",
"_POSIX_READER_WRITER_LOCKS",
"ARDUINO_ARCH_ESP32",
Expand Down
2 changes: 1 addition & 1 deletion tools/platformio-build-esp32c3.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
"UNITY_INCLUDE_CONFIG_H",
"WITH_POSIX",
"_GNU_SOURCE",
("IDF_VER", '\\"v4.4-112-g0a1e309ee4\\"'),
("IDF_VER", '\\"v4.4-114-g7c986a64c7\\"'),
"ESP_PLATFORM",
"_POSIX_READER_WRITER_LOCKS",
"ARDUINO_ARCH_ESP32",
Expand Down
2 changes: 1 addition & 1 deletion tools/platformio-build-esp32s2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@
"UNITY_INCLUDE_CONFIG_H",
"WITH_POSIX",
"_GNU_SOURCE",
("IDF_VER", '\\"v4.4-112-g0a1e309ee4\\"'),
("IDF_VER", '\\"v4.4-114-g7c986a64c7\\"'),
"ESP_PLATFORM",
"_POSIX_READER_WRITER_LOCKS",
"ARDUINO_ARCH_ESP32",
Expand Down
2 changes: 1 addition & 1 deletion tools/sdk/esp32/include/config/sdkconfig.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -682,5 +682,5 @@
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
#define CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
#define CONFIG_ARDUINO_IDF_COMMIT "0a1e309ee4"
#define CONFIG_ARDUINO_IDF_COMMIT "7c986a64c7"
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"
Binary file modified tools/sdk/esp32/lib/libapp_update.a
View file
Binary file not shown.
Binary file modified tools/sdk/esp32/lib/libesp_system.a
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion tools/sdk/esp32c3/include/config/sdkconfig.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -633,5 +633,5 @@
#define CONFIG_TIMER_TASK_STACK_SIZE CONFIG_ESP_TIMER_TASK_STACK_SIZE
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
#define CONFIG_ARDUINO_IDF_COMMIT "0a1e309ee4"
#define CONFIG_ARDUINO_IDF_COMMIT "7c986a64c7"
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"
Binary file modified tools/sdk/esp32c3/lib/libapp_update.a
View file
Binary file not shown.
Binary file modified tools/sdk/esp32c3/lib/libesp_system.a
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion tools/sdk/esp32s2/include/config/sdkconfig.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -582,5 +582,5 @@
#define CONFIG_USB_MSC_BUFSIZE CONFIG_TINYUSB_MSC_BUFSIZE
#define CONFIG_USB_MSC_ENABLED CONFIG_TINYUSB_MSC_ENABLED
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
#define CONFIG_ARDUINO_IDF_COMMIT "0a1e309ee4"
#define CONFIG_ARDUINO_IDF_COMMIT "7c986a64c7"
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"
Binary file modified tools/sdk/esp32s2/lib/libapp_update.a
View file
Binary file not shown.
Binary file modified tools/sdk/esp32s2/lib/libesp_system.a
View file
Binary file not shown.

4 comments on commit b69b44a

@Jason2866
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since mbedtls was updated in IDF44 this error happens

/home/runner/Arduino/hardware/espressif/esp32/libraries/WiFiClientSecure/src/ssl_client.cpp:24:4: warning: #warning "Please configure IDF framework to include mbedTLS -> Enable pre-shared-key ciphersuites and activate at least one cipher" [-Wcpp]
 #  warning "Please configure IDF framework to include mbedTLS -> Enable pre-shared-key ciphersuites and activate at least one cipher"
    ^~~~~~~

@me-no-dev
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@igrr is this expected? As far as I see in the previous commit, sdkconfig did not change apart from adding another define.

@igrr
Copy link
Member

@igrr igrr commented on b69b44a Feb 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to be related to this mbedTLS change: Mbed-TLS/mbedtls@eccd888. MbedTLS version in release/v4.4 was recently upgraded from 2.16.x to 2.28.x.
I think you need to replace this line:

arduino-esp32/libraries/WiFiClientSecure/src/ssl_client.cpp

Line 23 in ab6e010

#ifndef MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED

with

#ifndef MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED

(or you can do something like if !defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED) && !defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED) if you prefer to keep arduino-esp32 working with older versions of IDF release/v4.4...)

@me-no-dev
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

Please sign in to comment.