fix missing set hostname for TLS, update to latest IDF, add debug (can remove later)

arduino/libraries/WiFi/src/WiFi.cpp

@@ -22,7 +22,7 @@
 #include <esp_wifi.h>
 #include <tcpip_adapter.h>
 
-#include <apps/sntp/sntp.h>
+#include <lwip/apps/sntp.h>
 
 #include <lwip/dns.h>
 #include <lwip/netdb.h>
@@ -111,7 +111,7 @@ int WiFiClass::ping(/*IPAddress*/uint32_t host, uint8_t ttl)
 
   to.sin_len = sizeof(to);
   to.sin_family = AF_INET;
-  inet_addr_from_ipaddr(&to.sin_addr, ip_2_ip4(&addr));
+  inet_addr_from_ip4addr(&to.sin_addr, ip_2_ip4(&addr));
 
   sendto(s, &request, sizeof(request), 0, (struct sockaddr*)&to, sizeof(to));
   unsigned long sendTime = millis();

arduino/libraries/WiFi/src/WiFiSSLClient.cpp

@@ -56,6 +56,7 @@ int WiFiSSLClient::connect(const char* host, uint16_t port)
     _netContext.fd = -1;
     _connected = false;
 
+    ets_printf("*** connect init\n");
     mbedtls_ssl_init(&_sslContext);
     mbedtls_ctr_drbg_init(&_ctrDrbgContext);
     mbedtls_ssl_config_init(&_sslConfig);
@@ -63,43 +64,72 @@ int WiFiSSLClient::connect(const char* host, uint16_t port)
     mbedtls_x509_crt_init(&_caCrt);
     mbedtls_net_init(&_netContext);
 
+    ets_printf("*** connect inited\n");
+
+    ets_printf("*** connect drbgseed\n");
+
     if (mbedtls_ctr_drbg_seed(&_ctrDrbgContext, mbedtls_entropy_func, &_entropyContext, NULL, 0) != 0) {
       stop();
       return 0;
     }
 
+    ets_printf("*** connect ssl hostname\n");
+     /* Hostname set here should match CN in server certificate */
+    if(mbedtls_ssl_set_hostname(&_sslContext, host) != 0)
+    {
+      stop();
+      return 0;
+    }
+
+    ets_printf("*** connect ssl config\n");
+
     if (mbedtls_ssl_config_defaults(&_sslConfig, MBEDTLS_SSL_IS_CLIENT, MBEDTLS_SSL_TRANSPORT_STREAM, MBEDTLS_SSL_PRESET_DEFAULT) != 0) {
       stop();
       return 0;
     }
 
+    ets_printf("*** connect authmode\n");
+
     mbedtls_ssl_conf_authmode(&_sslConfig, MBEDTLS_SSL_VERIFY_REQUIRED);
 
     spi_flash_mmap_handle_t handle;
     const unsigned char* certs_data = {};
 
+    ets_printf("*** connect part findfirst\n");
+
     const esp_partition_t* part = esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_ANY, "certs");
     if (part == NULL)
     {
       return 0;
     }
 
+    ets_printf("*** connect part mmap\n");
+
     int ret = esp_partition_mmap(part, 0, part->size, SPI_FLASH_MMAP_DATA, (const void**)&certs_data, &handle);
     if (ret != ESP_OK)
     {
       return 0;
     }
 
+    ets_printf("*** connect crt parse\n");
+
     ret = mbedtls_x509_crt_parse(&_caCrt, certs_data, strlen((char*)certs_data) + 1);
     if (ret < 0) {
       stop();
       return 0;
     }
 
+    ets_printf("*** connect conf ca chain\n");
+
     mbedtls_ssl_conf_ca_chain(&_sslConfig, &_caCrt, NULL);
 
+
+    ets_printf("*** connect conf RNG\n");
+
     mbedtls_ssl_conf_rng(&_sslConfig, mbedtls_ctr_drbg_random, &_ctrDrbgContext);
 
+    ets_printf("*** connect ssl setup\n");
+
     if (mbedtls_ssl_setup(&_sslContext, &_sslConfig) != 0) {
       stop();
       return 0;
@@ -108,24 +138,39 @@ int WiFiSSLClient::connect(const char* host, uint16_t port)
     char portStr[6];
     itoa(port, portStr, 10);
 
+    ets_printf("*** connect netconnect\n");
+
     if (mbedtls_net_connect(&_netContext, host, portStr, MBEDTLS_NET_PROTO_TCP) != 0) {
       stop();
       return 0;
     }
 
+    ets_printf("*** connect set bio\n");
+
     mbedtls_ssl_set_bio(&_sslContext, &_netContext, mbedtls_net_send, mbedtls_net_recv, NULL);
 
-    int result;
+    int result = -1;
 
     do {
+      ets_printf("*** connect ssl handshake\n");
       result = mbedtls_ssl_handshake(&_sslContext);
     } while (result == MBEDTLS_ERR_SSL_WANT_READ || result == MBEDTLS_ERR_SSL_WANT_WRITE);
 
     if (result != 0) {
+      uint8_t module_id = (result >> 12) & 0x7;
+      uint8_t module_dep = (result >> 7) & 0x1F;
+      uint8_t lowlevel = result & 0x7F;
+      ets_printf("*** ssl fail! result %x\t module id: %x module dependant: %x lowlevel: %x\n", result, module_id, module_dep, lowlevel);
+
+      char str[100];
+      mbedtls_strerror(result, str, 100);
+      ets_printf("strerror: %s\n", str);
+
       stop();
       return 0;
     }
     
+    ets_printf("*** ssl set nonblock\n");
     mbedtls_net_set_nonblock(&_netContext);
     _connected = true;
 

sdkconfig

@@ -2,6 +2,7 @@
 # Automatically generated file; DO NOT EDIT.
 # Espressif IoT Development Framework Configuration
 #
+CONFIG_IDF_TARGET="esp32"
 
 #
 # SDK tool configuration
@@ -10,6 +11,13 @@ CONFIG_TOOLPREFIX="xtensa-esp32-elf-"
 CONFIG_PYTHON="python"
 CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y
 
+#
+# Application manager
+#
+CONFIG_APP_COMPILE_TIME_DATE=y
+CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=
+CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=
+
 #
 # Bootloader config
 #
@@ -24,10 +32,15 @@ CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V=
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
 CONFIG_BOOTLOADER_FACTORY_RESET=
 CONFIG_BOOTLOADER_APP_TEST=
+CONFIG_BOOTLOADER_WDT_ENABLE=y
+CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE=
+CONFIG_BOOTLOADER_WDT_TIME_MS=9000
+CONFIG_APP_ROLLBACK_ENABLE=
 
 #
 # Security features
 #
+CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT=
 CONFIG_SECURE_BOOT_ENABLED=
 CONFIG_FLASH_ENCRYPTION_ENABLED=
 
@@ -102,6 +115,7 @@ CONFIG_STACK_CHECK_STRONG=
 CONFIG_STACK_CHECK_ALL=
 CONFIG_STACK_CHECK=
 CONFIG_WARN_WRITE_STRINGS=
+CONFIG_DISABLE_GCC8_WARNINGS=
 
 #
 # Component config
@@ -120,6 +134,17 @@ CONFIG_AWS_IOT_SDK=
 # Bluetooth
 #
 CONFIG_BT_ENABLED=y
+
+#
+# Bluetooth controller
+#
+CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
+CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
+CONFIG_BTDM_CONTROLLER_MODE_BTDM=
+CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=3
+CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=3
+CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0
+CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_0=y
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_1=
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0
@@ -138,7 +163,15 @@ CONFIG_BT_HCI_UART_BAUDRATE=115200
 CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=y
 CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG=
 CONFIG_BTDM_MODEM_SLEEP_MODE_EVED=y
-CONFIG_BT_RESERVE_DRAM=0x10000
+CONFIG_BLE_SCAN_DUPLICATE=y
+CONFIG_SCAN_DUPLICATE_BY_DEVICE_ADDR=y
+CONFIG_SCAN_DUPLICATE_BY_ADV_DATA=
+CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=
+CONFIG_SCAN_DUPLICATE_TYPE=0
+CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
+CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=
+CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=
+CONFIG_BT_RESERVE_DRAM=0xdb5c
 
 #
 # Driver configurations
@@ -151,14 +184,17 @@ CONFIG_ADC_FORCE_XPD_FSM=
 CONFIG_ADC2_DISABLE_DAC=y
 
 #
-# SPI master configuration
+# SPI configuration
 #
 CONFIG_SPI_MASTER_IN_IRAM=y
 CONFIG_SPI_MASTER_ISR_IN_IRAM=y
+CONFIG_SPI_SLAVE_IN_IRAM=
+CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 
 #
 # ESP32-specific
 #
+CONFIG_IDF_TARGET_ESP32=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_80=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=
@@ -168,6 +204,10 @@ CONFIG_MEMMAP_TRACEMEM=
 CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
 CONFIG_ESP32_TRAX=
 CONFIG_TRACEMEM_RESERVE_DRAM=0x0
+
+#
+# Core dump
+#
 CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=
 CONFIG_ESP32_ENABLE_COREDUMP_TO_UART=
 CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
@@ -217,12 +257,15 @@ CONFIG_BROWNOUT_DET_LVL_SEL_5=
 CONFIG_BROWNOUT_DET_LVL_SEL_6=
 CONFIG_BROWNOUT_DET_LVL_SEL_7=
 CONFIG_BROWNOUT_DET_LVL=0
+CONFIG_REDUCE_PHY_TX_POWER=y
 CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y
 CONFIG_ESP32_TIME_SYSCALL_USE_RTC=
 CONFIG_ESP32_TIME_SYSCALL_USE_FRC1=
 CONFIG_ESP32_TIME_SYSCALL_USE_NONE=
 CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
 CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL=
+CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_OSC=
+CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256=
 CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
 CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000
 CONFIG_ESP32_XTAL_FREQ_40=y
@@ -252,6 +295,15 @@ CONFIG_ESP32_WIFI_RX_BA_WIN=6
 CONFIG_ESP32_WIFI_NVS_ENABLED=y
 CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y
 CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=
+CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
+CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE=y
+CONFIG_ESP32_WIFI_DEBUG_LOG_DEBUG=
+CONFIG_ESP32_WIFI_DEBUG_LOG_VERBOSE=y
+CONFIG_ESP32_WIFI_DEBUG_LOG_MODULE_ALL=
+CONFIG_ESP32_WIFI_DEBUG_LOG_MODULE_WIFI=y
+CONFIG_ESP32_WIFI_DEBUG_LOG_MODULE_COEX=
+CONFIG_ESP32_WIFI_DEBUG_LOG_MODULE_MESH=
+CONFIG_ESP32_WIFI_DEBUG_LOG_SUBMODULE=
 
 #
 # PHY
@@ -273,18 +325,36 @@ CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
 CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
 CONFIG_ADC_CAL_LUT_ENABLE=y
 
+#
+# Event Loop Library
+#
+CONFIG_EVENT_LOOP_PROFILING=
+
 #
 # ESP HTTP client
 #
 CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
 
+#
+# HTTP Server
+#
+CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
+CONFIG_HTTPD_MAX_URI_LEN=512
+
+#
+# ESP HTTPS OTA
+#
+CONFIG_OTA_ALLOW_HTTP=
+
 #
 # Ethernet
 #
 CONFIG_DMA_RX_BUF_NUM=10
 CONFIG_DMA_TX_BUF_NUM=10
 CONFIG_EMAC_L2_TO_L3_RX_BUF_MODE=
+CONFIG_EMAC_CHECK_LINK_PERIOD_MS=2000
 CONFIG_EMAC_TASK_PRIORITY=20
+CONFIG_EMAC_TASK_STACK_SIZE=3072
 
 #
 # FAT Filesystem support
@@ -319,10 +389,27 @@ CONFIG_FATFS_FS_LOCK=0
 CONFIG_FATFS_TIMEOUT_MS=10000
 CONFIG_FATFS_PER_FILE_CACHE=y
 
+#
+# Modbus configuration
+#
+CONFIG_MB_QUEUE_LENGTH=20
+CONFIG_MB_SERIAL_TASK_STACK_SIZE=2048
+CONFIG_MB_SERIAL_BUF_SIZE=256
+CONFIG_MB_SERIAL_TASK_PRIO=10
+CONFIG_MB_CONTROLLER_SLAVE_ID_SUPPORT=
+CONFIG_MB_CONTROLLER_NOTIFY_TIMEOUT=20
+CONFIG_MB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
+CONFIG_MB_CONTROLLER_STACK_SIZE=4096
+CONFIG_MB_EVENT_QUEUE_TIMEOUT=20
+CONFIG_MB_TIMER_PORT_ENABLED=y
+CONFIG_MB_TIMER_GROUP=0
+CONFIG_MB_TIMER_INDEX=0
+
 #
 # FreeRTOS
 #
 CONFIG_FREERTOS_UNICORE=
+CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
 CONFIG_FREERTOS_CORETIMER_0=y
 CONFIG_FREERTOS_CORETIMER_1=
 CONFIG_FREERTOS_HZ=100
@@ -348,6 +435,7 @@ CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0
 CONFIG_FREERTOS_USE_TRACE_FACILITY=
 CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=
 CONFIG_FREERTOS_DEBUG_INTERNALS=
+CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
 
 #
 # Heap memory debugging
@@ -389,8 +477,11 @@ CONFIG_LWIP_IP_FRAG=
 CONFIG_LWIP_IP_REASSEMBLY=
 CONFIG_LWIP_STATS=
 CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y
+CONFIG_ESP_GRATUITOUS_ARP=y
+CONFIG_GARP_TMR_INTERVAL=60
 CONFIG_TCPIP_RECVMBOX_SIZE=32
 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
+CONFIG_LWIP_DHCP_RESTORE_LAST_IP=
 
 #
 # DHCP server
@@ -425,6 +516,10 @@ CONFIG_TCP_OVERSIZE_DISABLE=
 CONFIG_LWIP_MAX_UDP_PCBS=16
 CONFIG_UDP_RECVMBOX_SIZE=6
 CONFIG_TCPIP_TASK_STACK_SIZE=2048
+CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
+CONFIG_TCPIP_TASK_AFFINITY_CPU0=
+CONFIG_TCPIP_TASK_AFFINITY_CPU1=
+CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF
 CONFIG_PPP_SUPPORT=
 
 #
@@ -441,7 +536,11 @@ CONFIG_LWIP_MAX_RAW_PCBS=16
 #
 # mbedTLS
 #
+CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
+CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC=
+CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC=
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
+CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=
 CONFIG_MBEDTLS_DEBUG=
 CONFIG_MBEDTLS_HARDWARE_AES=y
 CONFIG_MBEDTLS_HARDWARE_MPI=
@@ -515,6 +614,26 @@ CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y
 CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
 
+#
+# mDNS
+#
+CONFIG_MDNS_MAX_SERVICES=10
+
+#
+# ESP-MQTT Configurations
+#
+CONFIG_MQTT_PROTOCOL_311=y
+CONFIG_MQTT_TRANSPORT_SSL=y
+CONFIG_MQTT_TRANSPORT_WEBSOCKET=y
+CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y
+CONFIG_MQTT_USE_CUSTOM_CONFIG=
+CONFIG_MQTT_TASK_CORE_SELECTION_ENABLED=
+CONFIG_MQTT_CUSTOM_OUTBOX=
+
+#
+# NVS
+#
+
 #
 # OpenSSL
 #
@@ -527,6 +646,12 @@ CONFIG_OPENSSL_ASSERT_EXIT=
 #
 CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
 CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
+CONFIG_PTHREAD_STACK_MIN=768
+CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY=y
+CONFIG_ESP32_DEFAULT_PTHREAD_CORE_0=
+CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=
+CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1
+CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
 
 #
 # SPI Flash driver
@@ -534,9 +659,6 @@ CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
 CONFIG_SPI_FLASH_VERIFY_WRITE=
 CONFIG_SPI_FLASH_ENABLE_COUNTERS=
 CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
-CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y
-CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS=
-CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED=
 
 #
 # SPIFFS Configuration
@@ -570,14 +692,25 @@ CONFIG_SPIFFS_CHECK_DBG=
 CONFIG_SPIFFS_TEST_VISUALISATION=
 
 #
-# tcpip adapter
+# TCP/IP Adapter
 #
 CONFIG_IP_LOST_TIMER_INTERVAL=120
+CONFIG_TCPIP_LWIP=y
+
+#
+# Unity unit testing library
+#
+CONFIG_UNITY_ENABLE_FLOAT=y
+CONFIG_UNITY_ENABLE_DOUBLE=y
+CONFIG_UNITY_ENABLE_COLOR=
+CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
+CONFIG_UNITY_ENABLE_FIXTURE=
 
 #
 # Virtual file system
 #
 CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
+CONFIG_SUPPORT_TERMIOS=y
 
 #
 # Wear Levelling