Roll esp idf (#2057)

toitlang · Jan 17, 2024 · b28b602 · b28b602
1 parent 0870c25
commit b28b602
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 30 deletions.
diff --git a/src/resources/tls.cc b/src/resources/tls.cc
@@ -25,6 +25,7 @@
 #include <mbedtls/platform.h>
 #if MBEDTLS_VERSION_MAJOR >= 3
 #include <../library/ssl_misc.h>
+#include <mbedtls/cipher.h>
 #else
 #include <mbedtls/ssl_internal.h>
 #endif
@@ -746,9 +747,9 @@ static bool known_cipher_info(const mbedtls_cipher_info_t* info, size_t key_bitl
   } else {
     return false;
   }
-  if (info->key_bitlen != key_bitlen) return false;
+  if (mbedtls_cipher_info_get_key_bitlen(info) != key_bitlen) return false;
   if (iv_len != 12) return false;
-  if (info->iv_size != 12) return false;
+  if (mbedtls_cipher_info_get_iv_size(info) != 12) return false;
   if ((info->flags & ~MBEDTLS_CIPHER_VARIABLE_IV_LEN) != 0) return false;
   return true;
 }

diff --git a/third_party/esp-idf b/third_party/esp-idf
diff --git a/toolchains/esp32/sdkconfig b/toolchains/esp32/sdkconfig
@@ -60,7 +60,7 @@ CONFIG_SOC_CPU_INTR_NUM=32
 CONFIG_SOC_CPU_HAS_FPU=y
 CONFIG_SOC_CPU_BREAKPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINTS_NUM=2
-CONFIG_SOC_CPU_WATCHPOINT_SIZE=64
+CONFIG_SOC_CPU_WATCHPOINT_MAX_REGION_SIZE=64
 CONFIG_SOC_DAC_PERIPH_NUM=2
 CONFIG_SOC_DAC_RESOLUTION=8
 CONFIG_SOC_GPIO_PORT=1
@@ -418,15 +418,14 @@ CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS=y
 CONFIG_BT_NIMBLE_HS_STOP_TIMEOUT_MS=2000
 # CONFIG_BT_NIMBLE_HOST_BASED_PRIVACY is not set
 # CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT is not set
-# CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EN is not set
-CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_DIS=y
-CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EFF=0
 CONFIG_BT_NIMBLE_WHITELIST_SIZE=12
 # CONFIG_BT_NIMBLE_TEST_THROUGHPUT_TEST is not set
 # CONFIG_BT_NIMBLE_BLUFI_ENABLE is not set
 CONFIG_BT_NIMBLE_USE_ESP_TIMER=y
 CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE=y
 # CONFIG_BT_NIMBLE_BLE_GATT_BLOB_TRANSFER is not set
+# CONFIG_BT_NIMBLE_HIGH_DUTY_ADV_ITVL is not set
+# CONFIG_BT_NIMBLE_HOST_QUEUE_CONG_CHECK is not set
 # end of NimBLE Options
 
 #
@@ -551,6 +550,7 @@ CONFIG_UART_ISR_IN_IRAM=y
 # RMT Configuration
 #
 # CONFIG_RMT_ISR_IRAM_SAFE is not set
+# CONFIG_RMT_RECV_FUNC_IN_IRAM is not set
 # CONFIG_RMT_SUPPRESS_DEPRECATE_WARN is not set
 # CONFIG_RMT_ENABLE_DEBUG_LOG is not set
 # end of RMT Configuration
@@ -629,6 +629,7 @@ CONFIG_ETH_RMII_CLK_IN_GPIO=0
 CONFIG_ETH_DMA_BUFFER_SIZE=512
 CONFIG_ETH_DMA_RX_BUFFER_NUM=10
 CONFIG_ETH_DMA_TX_BUFFER_NUM=10
+# CONFIG_ETH_IRAM_OPTIMIZATION is not set
 CONFIG_ETH_USE_SPI_ETHERNET=y
 CONFIG_ETH_SPI_ETHERNET_DM9051=y
 CONFIG_ETH_SPI_ETHERNET_W5500=y
@@ -729,6 +730,7 @@ CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
 CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
 CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y
 CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=2000
+CONFIG_ESP_SLEEP_GPIO_ENABLE_INTERNAL_RESISTORS=y
 # end of Sleep Config
 
 #
@@ -921,6 +923,10 @@ CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=16
 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_STATIC_RX_MGMT_BUFFER=y
+# CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER is not set
+CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=0
+CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF=5
 # CONFIG_ESP32_WIFI_CSI_ENABLED is not set
 CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
 CONFIG_ESP32_WIFI_TX_BA_WIN=6
@@ -942,6 +948,7 @@ CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
 # CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set
 CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=7
 # CONFIG_ESP_WIFI_WPS_PASSPHRASE is not set
+CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=y
 # end of Wi-Fi
 
 #
@@ -1105,6 +1112,7 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="toit"
 # CONFIG_LWIP_NETIF_API is not set
+CONFIG_LWIP_TCPIP_TASK_PRIO=18
 # CONFIG_LWIP_TCPIP_CORE_LOCKING is not set
 # CONFIG_LWIP_CHECK_THREAD_SAFETY is not set
 # CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES is not set
@@ -1170,6 +1178,8 @@ CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640
 CONFIG_LWIP_TCP_WND_DEFAULT=5640
 CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
 CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
+CONFIG_LWIP_TCP_OOSEQ_TIMEOUT=6
+CONFIG_LWIP_TCP_OOSEQ_MAX_PBUFS=4
 # CONFIG_LWIP_TCP_SACK_OUT is not set
 CONFIG_LWIP_TCP_OVERSIZE_MSS=y
 # CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set
@@ -1200,6 +1210,8 @@ CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
 # CONFIG_LWIP_PPP_SUPPORT is not set
 CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
 CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
+CONFIG_LWIP_ND6=y
+# CONFIG_LWIP_FORCE_ROUTER_FORWARDING is not set
 # CONFIG_LWIP_SLIP_SUPPORT is not set
 
 #
@@ -1372,7 +1384,6 @@ CONFIG_MBEDTLS_CHACHA20_C=y
 CONFIG_MBEDTLS_CHACHAPOLY_C=y
 # CONFIG_MBEDTLS_HKDF_C is not set
 # CONFIG_MBEDTLS_THREADING_C is not set
-# CONFIG_MBEDTLS_SECURITY_RISKS is not set
 # end of mbedTLS
 
 #
@@ -1601,7 +1612,6 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
 CONFIG_WPA_MBEDTLS_CRYPTO=y
 CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
 # CONFIG_WPA_WAPI_PSK is not set
-# CONFIG_WPA_SUITE_B_192 is not set
 # CONFIG_WPA_DEBUG_PRINT is not set
 # CONFIG_WPA_TESTING_OPTIONS is not set
 # CONFIG_WPA_WPS_STRICT is not set

diff --git a/toolchains/esp32c3/sdkconfig b/toolchains/esp32c3/sdkconfig
@@ -65,7 +65,7 @@ CONFIG_SOC_CPU_INTR_NUM=32
 CONFIG_SOC_CPU_HAS_FLEXIBLE_INTC=y
 CONFIG_SOC_CPU_BREAKPOINTS_NUM=8
 CONFIG_SOC_CPU_WATCHPOINTS_NUM=8
-CONFIG_SOC_CPU_WATCHPOINT_SIZE=0x80000000
+CONFIG_SOC_CPU_WATCHPOINT_MAX_REGION_SIZE=0x80000000
 CONFIG_SOC_DS_SIGNATURE_MAX_BIT_LEN=3072
 CONFIG_SOC_DS_KEY_PARAM_MD_IV_LENGTH=16
 CONFIG_SOC_DS_KEY_CHECK_MAX_WAIT_US=1100
@@ -295,6 +295,7 @@ CONFIG_ESP_ROM_HAS_ERASE_0_REGION_BUG=y
 CONFIG_ESP_ROM_GET_CLK_FREQ=y
 CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y
 CONFIG_ESP_ROM_HAS_ETS_PRINTF_BUG=y
+CONFIG_ESP_ROM_NEEDS_SET_CACHE_MMU_SIZE=y
 
 #
 # Boot ROM Behavior
@@ -463,15 +464,14 @@ CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY=y
 CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY=y
 # CONFIG_BT_NIMBLE_EXT_ADV is not set
 CONFIG_BT_NIMBLE_MAX_PERIODIC_SYNCS=0
-# CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EN is not set
-CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_DIS=y
-CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EFF=0
 CONFIG_BT_NIMBLE_WHITELIST_SIZE=12
 # CONFIG_BT_NIMBLE_TEST_THROUGHPUT_TEST is not set
 # CONFIG_BT_NIMBLE_BLUFI_ENABLE is not set
 CONFIG_BT_NIMBLE_USE_ESP_TIMER=y
 CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE=y
 # CONFIG_BT_NIMBLE_BLE_GATT_BLOB_TRANSFER is not set
+# CONFIG_BT_NIMBLE_HIGH_DUTY_ADV_ITVL is not set
+# CONFIG_BT_NIMBLE_HOST_QUEUE_CONG_CHECK is not set
 # end of NimBLE Options
 
 #
@@ -486,7 +486,10 @@ CONFIG_BT_CTRL_HCI_MODE_VHCI=y
 # CONFIG_BT_CTRL_HCI_MODE_UART_H4 is not set
 CONFIG_BT_CTRL_HCI_TL=1
 CONFIG_BT_CTRL_ADV_DUP_FILT_MAX=30
-# CONFIG_BT_CTRL_HW_CCA is not set
+CONFIG_BT_BLE_CCA_MODE_NONE=y
+# CONFIG_BT_BLE_CCA_MODE_HW is not set
+# CONFIG_BT_BLE_CCA_MODE_SW is not set
+CONFIG_BT_BLE_CCA_MODE=0
 CONFIG_BT_CTRL_HW_CCA_VAL=20
 CONFIG_BT_CTRL_HW_CCA_EFF=0
 CONFIG_BT_CTRL_CE_LENGTH_TYPE_ORIG=y
@@ -619,6 +622,7 @@ CONFIG_UART_ISR_IN_IRAM=y
 # RMT Configuration
 #
 # CONFIG_RMT_ISR_IRAM_SAFE is not set
+# CONFIG_RMT_RECV_FUNC_IN_IRAM is not set
 # CONFIG_RMT_SUPPRESS_DEPRECATE_WARN is not set
 # CONFIG_RMT_ENABLE_DEBUG_LOG is not set
 # end of RMT Configuration
@@ -735,14 +739,15 @@ CONFIG_HTTPD_PURGE_BUF_LEN=32
 # CONFIG_ESP32C3_REV_MIN_2 is not set
 CONFIG_ESP32C3_REV_MIN_3=y
 # CONFIG_ESP32C3_REV_MIN_4 is not set
+# CONFIG_ESP32C3_REV_MIN_101 is not set
 CONFIG_ESP32C3_REV_MIN_FULL=3
 CONFIG_ESP_REV_MIN_FULL=3
 
 #
-# Maximum Supported ESP32-C3 Revision (Rev v0.99)
+# Maximum Supported ESP32-C3 Revision (Rev v1.99)
 #
-CONFIG_ESP32C3_REV_MAX_FULL=99
-CONFIG_ESP_REV_MAX_FULL=99
+CONFIG_ESP32C3_REV_MAX_FULL=199
+CONFIG_ESP_REV_MAX_FULL=199
 # end of Chip revision
 
 #
@@ -764,6 +769,7 @@ CONFIG_ESP32C3_UNIVERSAL_MAC_ADDRESSES=4
 CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
 # CONFIG_ESP_SLEEP_MSPI_NEED_ALL_IO_PU is not set
 CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y
+CONFIG_ESP_SLEEP_GPIO_ENABLE_INTERNAL_RESISTORS=y
 # end of Sleep Config
 
 CONFIG_ESP_SLEEP_SYSTIMER_STALL_WORKAROUND=y
@@ -951,6 +957,10 @@ CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=16
 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_STATIC_RX_MGMT_BUFFER=y
+# CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER is not set
+CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=0
+CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF=5
 # CONFIG_ESP32_WIFI_CSI_ENABLED is not set
 CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
 CONFIG_ESP32_WIFI_TX_BA_WIN=6
@@ -972,6 +982,7 @@ CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
 # CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set
 CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=7
 # CONFIG_ESP_WIFI_WPS_PASSPHRASE is not set
+CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=y
 # end of Wi-Fi
 
 #
@@ -1136,6 +1147,7 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="toit"
 # CONFIG_LWIP_NETIF_API is not set
+CONFIG_LWIP_TCPIP_TASK_PRIO=18
 # CONFIG_LWIP_TCPIP_CORE_LOCKING is not set
 # CONFIG_LWIP_CHECK_THREAD_SAFETY is not set
 # CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES is not set
@@ -1201,6 +1213,8 @@ CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640
 CONFIG_LWIP_TCP_WND_DEFAULT=5640
 CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
 CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
+CONFIG_LWIP_TCP_OOSEQ_TIMEOUT=6
+CONFIG_LWIP_TCP_OOSEQ_MAX_PBUFS=4
 # CONFIG_LWIP_TCP_SACK_OUT is not set
 CONFIG_LWIP_TCP_OVERSIZE_MSS=y
 # CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set
@@ -1230,6 +1244,8 @@ CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
 # CONFIG_LWIP_PPP_SUPPORT is not set
 CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
 CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
+CONFIG_LWIP_ND6=y
+# CONFIG_LWIP_FORCE_ROUTER_FORWARDING is not set
 # CONFIG_LWIP_SLIP_SUPPORT is not set
 
 #
@@ -1403,7 +1419,6 @@ CONFIG_MBEDTLS_CHACHA20_C=y
 CONFIG_MBEDTLS_CHACHAPOLY_C=y
 # CONFIG_MBEDTLS_HKDF_C is not set
 # CONFIG_MBEDTLS_THREADING_C is not set
-# CONFIG_MBEDTLS_SECURITY_RISKS is not set
 # end of mbedTLS
 
 #
@@ -1736,6 +1751,8 @@ CONFIG_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
 CONFIG_NIMBLE_RPA_TIMEOUT=900
 # CONFIG_NIMBLE_MESH is not set
 CONFIG_NIMBLE_CRYPTO_STACK_MBEDTLS=y
+# CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EN is not set
+CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_DIS=y
 # CONFIG_EVENT_LOOP_PROFILING is not set
 CONFIG_POST_EVENTS_FROM_ISR=y
 CONFIG_POST_EVENTS_FROM_IRAM_ISR=y

diff --git a/toolchains/esp32s2/sdkconfig b/toolchains/esp32s2/sdkconfig
@@ -65,7 +65,7 @@ CONFIG_SOC_CPU_CORES_NUM=1
 CONFIG_SOC_CPU_INTR_NUM=32
 CONFIG_SOC_CPU_BREAKPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINTS_NUM=2
-CONFIG_SOC_CPU_WATCHPOINT_SIZE=64
+CONFIG_SOC_CPU_WATCHPOINT_MAX_REGION_SIZE=64
 CONFIG_SOC_DAC_PERIPH_NUM=2
 CONFIG_SOC_DAC_RESOLUTION=8
 CONFIG_SOC_GPIO_PORT=1
@@ -177,7 +177,7 @@ CONFIG_SOC_UART_SUPPORT_REF_TICK=y
 CONFIG_SOC_UART_FIFO_LEN=128
 CONFIG_SOC_UART_BITRATE_MAX=5000000
 CONFIG_SOC_SPIRAM_SUPPORTED=y
-CONFIG_SOC_USB_PERIPH_NUM=y
+CONFIG_SOC_USB_OTG_PERIPH_NUM=1
 CONFIG_SOC_SHA_DMA_MAX_BUFFER_SIZE=3968
 CONFIG_SOC_SHA_SUPPORT_DMA=y
 CONFIG_SOC_SHA_SUPPORT_RESUME=y
@@ -488,6 +488,7 @@ CONFIG_UART_ISR_IN_IRAM=y
 # RMT Configuration
 #
 # CONFIG_RMT_ISR_IRAM_SAFE is not set
+# CONFIG_RMT_RECV_FUNC_IN_IRAM is not set
 # CONFIG_RMT_SUPPRESS_DEPRECATE_WARN is not set
 # CONFIG_RMT_ENABLE_DEBUG_LOG is not set
 # end of RMT Configuration
@@ -628,6 +629,7 @@ CONFIG_ESP_SLEEP_PSRAM_LEAKAGE_WORKAROUND=y
 # CONFIG_ESP_SLEEP_MSPI_NEED_ALL_IO_PU is not set
 CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
 # CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set
+CONFIG_ESP_SLEEP_GPIO_ENABLE_INTERNAL_RESISTORS=y
 # end of Sleep Config
 
 #
@@ -866,6 +868,10 @@ CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
 CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16
 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_STATIC_RX_MGMT_BUFFER=y
+# CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER is not set
+CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=0
+CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF=5
 # CONFIG_ESP32_WIFI_CSI_ENABLED is not set
 CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
 CONFIG_ESP32_WIFI_TX_BA_WIN=6
@@ -888,6 +894,7 @@ CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
 # CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set
 CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=7
 # CONFIG_ESP_WIFI_WPS_PASSPHRASE is not set
+CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=y
 # end of Wi-Fi
 
 #
@@ -1051,6 +1058,7 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="toit"
 # CONFIG_LWIP_NETIF_API is not set
+CONFIG_LWIP_TCPIP_TASK_PRIO=18
 # CONFIG_LWIP_TCPIP_CORE_LOCKING is not set
 # CONFIG_LWIP_CHECK_THREAD_SAFETY is not set
 # CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES is not set
@@ -1116,6 +1124,8 @@ CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5640
 CONFIG_LWIP_TCP_WND_DEFAULT=5640
 CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
 CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
+CONFIG_LWIP_TCP_OOSEQ_TIMEOUT=6
+CONFIG_LWIP_TCP_OOSEQ_MAX_PBUFS=0
 # CONFIG_LWIP_TCP_SACK_OUT is not set
 CONFIG_LWIP_TCP_OVERSIZE_MSS=y
 # CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set
@@ -1146,6 +1156,8 @@ CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
 # CONFIG_LWIP_PPP_SUPPORT is not set
 CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
 CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
+CONFIG_LWIP_ND6=y
+# CONFIG_LWIP_FORCE_ROUTER_FORWARDING is not set
 # CONFIG_LWIP_SLIP_SUPPORT is not set
 
 #
@@ -1231,7 +1243,7 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=200
 # end of Certificate Bundle
 
 # CONFIG_MBEDTLS_ECP_RESTARTABLE is not set
-# CONFIG_MBEDTLS_CMAC_C is not set
+CONFIG_MBEDTLS_CMAC_C=y
 CONFIG_MBEDTLS_HARDWARE_AES=y
 CONFIG_MBEDTLS_AES_USE_INTERRUPT=y
 CONFIG_MBEDTLS_HARDWARE_GCM=y
@@ -1320,7 +1332,6 @@ CONFIG_MBEDTLS_CHACHA20_C=y
 CONFIG_MBEDTLS_CHACHAPOLY_C=y
 # CONFIG_MBEDTLS_HKDF_C is not set
 # CONFIG_MBEDTLS_THREADING_C is not set
-# CONFIG_MBEDTLS_SECURITY_RISKS is not set
 # end of mbedTLS
 
 #
@@ -1556,7 +1567,6 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
 CONFIG_WPA_MBEDTLS_CRYPTO=y
 CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
 # CONFIG_WPA_WAPI_PSK is not set
-# CONFIG_WPA_SUITE_B_192 is not set
 # CONFIG_WPA_DEBUG_PRINT is not set
 # CONFIG_WPA_TESTING_OPTIONS is not set
 # CONFIG_WPA_WPS_STRICT is not set