Skip to content

Commit 99ed43f

Browse files
committed
TLS debugging
1 parent b1f918e commit 99ed43f

File tree

7 files changed

+32
-6
lines changed

7 files changed

+32
-6
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,3 +153,6 @@
153153
[submodule "ports/esp32s2/esp-idf"]
154154
path = ports/esp32s2/esp-idf
155155
url = https://github.com/espressif/esp-idf.git
156+
[submodule "ports/esp32s2/certificates/nina-fw"]
157+
path = ports/esp32s2/certificates/nina-fw
158+
url = https://github.com/adafruit/nina-fw.git

ports/esp32s2/boards/espressif_saola_1_wrover/sdkconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
12
CONFIG_ESP32S2_SPIRAM_SUPPORT=y
23

34
#
@@ -31,3 +32,15 @@ CONFIG_SPIRAM_USE_MEMMAP=y
3132
CONFIG_SPIRAM_MEMTEST=y
3233
# CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY is not set
3334
# end of SPI RAM config
35+
36+
CONFIG_MBEDTLS_DEBUG=y
37+
# CONFIG_MBEDTLS_DEBUG_LEVEL_WARN is not set
38+
# CONFIG_MBEDTLS_DEBUG_LEVEL_INFO is not set
39+
# CONFIG_MBEDTLS_DEBUG_LEVEL_DEBUG is not set
40+
CONFIG_MBEDTLS_DEBUG_LEVEL_VERBOSE=y
41+
CONFIG_MBEDTLS_DEBUG_LEVEL=4
42+
# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL is not set
43+
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE=y
44+
CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE=y
45+
CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="certificates/nina-fw/data/roots.pem"
46+
CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y

ports/esp32s2/certificates/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
We share root certificates with the nina-fw to ensure they both use the same roots.
2+
3+
https://github.com/adafruit/nina-fw

ports/esp32s2/certificates/nina-fw

Submodule nina-fw added at f2a0e60

ports/esp32s2/common-hal/wifi/__init__.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,18 @@ static void event_handler(void* arg, esp_event_base_t event_base,
8888
}
8989
}
9090

91+
static bool netif_inited;
9192
static bool wifi_inited;
9293

9394
void common_hal_wifi_init(void) {
9495
wifi_inited = true;
9596
common_hal_wifi_radio_obj.base.type = &wifi_radio_type;
9697

97-
ESP_ERROR_CHECK(esp_netif_init());
98-
ESP_ERROR_CHECK(esp_event_loop_create_default());
98+
if (!netif_inited) {
99+
ESP_ERROR_CHECK(esp_netif_init());
100+
ESP_ERROR_CHECK(esp_event_loop_create_default());
101+
netif_inited = true;
102+
}
99103

100104
wifi_radio_obj_t* self = &common_hal_wifi_radio_obj;
101105
self->netif = esp_netif_create_default_wifi_sta();
@@ -144,7 +148,8 @@ void wifi_reset(void) {
144148
ESP_ERROR_CHECK(esp_wifi_deinit());
145149
esp_netif_destroy(radio->netif);
146150
radio->netif = NULL;
147-
ESP_ERROR_CHECK(esp_netif_deinit());
151+
// De-initing the LWIP network interface always errors currently.
152+
// ESP_ERROR_CHECK(esp_netif_deinit());
148153
}
149154

150155
void ipaddress_ipaddress_to_esp_idf(mp_obj_t ip_address, ip_addr_t* esp_ip_address) {

ports/esp32s2/esp-idf-config/sdkconfig-opt.defaults

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ CONFIG_CONSOLE_UART_NUM=-1
99
# CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT is not set
1010
CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT=y
1111
# CONFIG_ESP32S2_PANIC_PRINT_HALT is not set
12-
CONFIG_ESP32S2_PANIC_SILENT_REBOOT=y
12+
CONFIG_ESP32S2_PANIC_SILENT_REBOOT=y
13+
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y

ports/esp32s2/esp-idf-config/sdkconfig.defaults

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ CONFIG_COMPILER_OPTIMIZATION_SIZE=y
125125
# CONFIG_COMPILER_OPTIMIZATION_PERF is not set
126126
# CONFIG_COMPILER_OPTIMIZATION_NONE is not set
127127
# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE is not set
128-
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
128+
# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set
129129
# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set
130130
# CONFIG_COMPILER_CXX_EXCEPTIONS is not set
131131
# CONFIG_COMPILER_CXX_RTTI is not set
@@ -792,7 +792,7 @@ CONFIG_MONITOR_BAUD=115200
792792
# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
793793
CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
794794
# CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED is not set
795-
CONFIG_OPTIMIZATION_ASSERTIONS_SILENT=y
795+
# CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set
796796
# CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set
797797
# CONFIG_CXX_EXCEPTIONS is not set
798798
CONFIG_STACK_CHECK_NONE=y

0 commit comments

Comments
 (0)