Skip to content

Commit 4674d2e

Browse files
authored
Merge pull request #10354 from dhalbert/espressif-full-certificate-bundle
espressif: switch to full root certificate bundle
2 parents a9a5b67 + 146da64 commit 4674d2e

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,7 @@ CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048
9696
#
9797
# Certificate Bundle
9898
#
99-
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE=y
100-
CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE=y
101-
CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="../../lib/certificates/data/roots.pem"
99+
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=y
102100
# end of Certificate Bundle
103101

104102
# CONFIG_MBEDTLS_GCM_SUPPORT_NON_AES_CIPHER is not set

ports/espressif/mpconfigport.mk

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,6 @@ CIRCUITPY_TOUCHIO_USE_NATIVE = 0
164164
CIRCUITPY_USB_DEVICE = 0
165165
CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 1
166166

167-
# Some C3 boards have only 2MB flash
168-
ifeq ($(CIRCUITPY_ESP_FLASH_SIZE),2MB)
169-
CIRCUITPY_BLEIO_NATIVE = 0
170-
endif
171-
172167
else ifeq ($(IDF_TARGET),esp32c6)
173168
# Modules
174169
CIRCUITPY_ESPCAMERA = 0
@@ -275,8 +270,10 @@ ifeq ($(CIRCUITPY_ESP_FLASH_SIZE),2MB)
275270
CIRCUITPY__EVE = 0
276271
CIRCUITPY_AUDIOMP3 = 0
277272
CIRCUITPY_BITMAPFILTER ?= 0
278-
CIRCUITPY_BLEIO_NATIVE ?= 0
273+
CIRCUITPY_BLEIO_NATIVE = 0
279274
CIRCUITPY_DUALBANK = 0
275+
CIRCUITPY_MAX3421E = 0
276+
CIRCUITPY_RGBMATRIX = 0
280277
OPTIMIZATION_FLAGS ?= -Os
281278
endif
282279

0 commit comments

Comments
 (0)