diff --git a/arduino/libraries/WiFi/src/WiFiSSLClient.cpp b/arduino/libraries/WiFi/src/WiFiSSLClient.cpp index e8b3020..781e4aa 100644 --- a/arduino/libraries/WiFi/src/WiFiSSLClient.cpp +++ b/arduino/libraries/WiFi/src/WiFiSSLClient.cpp @@ -55,7 +55,7 @@ WiFiSSLClient::WiFiSSLClient() : int WiFiSSLClient::connect(const char* host, uint16_t port) { ets_printf("** Connect Called"); - // hardcode private key + const char AWS_CERT_PRIVATE[] = "-----BEGIN RSA PRIVATE KEY-----\n" \ "MIIEowIBAAKCAQEAzKARb1w7VldBjgWjc9i8EZXpYfAlgog53mJNngxCaRg2qf2r\n" \ @@ -216,11 +216,11 @@ int WiFiSSLClient::connect(const char* host, uint16_t port, const char* client_c ets_printf("*** connect ssl setup\n"); if ((ret = mbedtls_ssl_setup(&_sslContext, &_sslConfig)) != 0) { if (ret == -0x7f00){ - ets_printf("%s", _clientCrt); + ets_printf("%s", &_clientCrt); ets_printf("\nMBEDTLS_ERR_SSL_ALLOC_FAILED\n"); ets_printf("\nFree internal heap: %u\n", heap_caps_get_free_size(MALLOC_CAP_8BIT)); } - ets_printf("Unable to connect ssl setup %d", ret); + ets_printf("Unable to connect ssl setup %d\n", ret); stop(); return 0; } diff --git a/main/CommandHandler.cpp b/main/CommandHandler.cpp index 16c74e5..5c29658 100644 --- a/main/CommandHandler.cpp +++ b/main/CommandHandler.cpp @@ -1066,8 +1066,8 @@ int setClientCert(const uint8_t command[], uint8_t response[]){ ets_printf("\nCert: \n %s", ca_cert_buf); // todo: remove in favor of max_sockets impl. below + ets_printf("\nFree internal heap: %u\n", heap_caps_get_free_size(MALLOC_CAP_8BIT)); tlsClients[0].setCertificate(ca_cert_buf); - //free(ca_cert_buf); ets_printf("\nFree internal heap: %u\n", heap_caps_get_free_size(MALLOC_CAP_8BIT)); /* @@ -1077,7 +1077,6 @@ int setClientCert(const uint8_t command[], uint8_t response[]){ tlsClients[socket].setCertificate(ca_cert_buf); } */ - response[2] = 1; // number of parameters response[3] = 1; // parameter 1 length response[4] = 1; diff --git a/sdkconfig b/sdkconfig index ddfac98..4ad2550 100644 --- a/sdkconfig +++ b/sdkconfig @@ -124,47 +124,12 @@ 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_BT_ENABLED= +CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0 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 -CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI= -CONFIG_BTDM_CONTROLLER_HCI_MODE_UART_H4=y - -# -# HCI UART(H4) Options -# -CONFIG_BT_HCI_UART_NO=1 -CONFIG_BT_HCI_UART_BAUDRATE=115200 - -# -# MODEM SLEEP Options -# -CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=y -CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG= -CONFIG_BTDM_MODEM_SLEEP_MODE_EVED=y -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_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y -CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM=100 -CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD=20 -CONFIG_BT_RESERVE_DRAM=0xdb5c +CONFIG_BT_RESERVE_DRAM=0 # # Driver configurations @@ -261,6 +226,7 @@ CONFIG_ESP32_XTAL_FREQ_26= CONFIG_ESP32_XTAL_FREQ_AUTO= CONFIG_ESP32_XTAL_FREQ=40 CONFIG_DISABLE_BASIC_ROM_CONSOLE= +CONFIG_NO_BLOBS= CONFIG_ESP_TIMER_PROFILING= CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS= CONFIG_ESP_ERR_TO_NAME_LOOKUP=y @@ -268,7 +234,6 @@ CONFIG_ESP_ERR_TO_NAME_LOOKUP=y # # Wi-Fi # -CONFIG_SW_COEXIST_ENABLE= CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER= @@ -514,9 +479,9 @@ CONFIG_LWIP_MAX_RAW_PCBS=16 CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC= CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC= -CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=4000 +CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=8192 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN= -CONFIG_MBEDTLS_DEBUG= +CONFIG_MBEDTLS_DEBUG=y CONFIG_MBEDTLS_HARDWARE_AES=y CONFIG_MBEDTLS_HARDWARE_MPI= CONFIG_MBEDTLS_HARDWARE_SHA=