djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8374 from dhalbert/new-certificates-submodule 

Update TLS certificates and use new certificates submodule
This commit is contained in:
Dan Halbert 2023-09-07 10:19:05 -04:00 committed by GitHub
parent 6f5a5a5b38 58a21326b2
commit 4dd45b6dc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -144,9 +144,6 @@
path = ports/espressif/esp-idf path = ports/espressif/esp-idf
url = https://github.com/adafruit/esp-idf.git url = https://github.com/adafruit/esp-idf.git
branch = release/v4.4-circuitpython branch = release/v4.4-circuitpython
[submodule "ports/espressif/certificates/nina-fw"]
path = lib/certificates/nina-fw
url = https://github.com/adafruit/nina-fw.git
[submodule "frozen/Adafruit_CircuitPython_ST7789"] [submodule "frozen/Adafruit_CircuitPython_ST7789"]
path = frozen/Adafruit_CircuitPython_ST7789 path = frozen/Adafruit_CircuitPython_ST7789
url = https://github.com/adafruit/Adafruit_CircuitPython_ST7789 url = https://github.com/adafruit/Adafruit_CircuitPython_ST7789
@ -341,3 +338,6 @@
[submodule "frozen/Adafruit_CircuitPython_Wave"] [submodule "frozen/Adafruit_CircuitPython_Wave"]
path = frozen/Adafruit_CircuitPython_Wave path = frozen/Adafruit_CircuitPython_Wave
url = https://github.com/adafruit/Adafruit_CircuitPython_Wave.git url = https://github.com/adafruit/Adafruit_CircuitPython_Wave.git
[submodule "lib/certificates"]
path = lib/certificates
url = https://github.com/adafruit/certificates

1
lib/certificates Submodule

@ -0,0 +1 @@
Subproject commit 5c85c604a0d77a08df93435e4afad5f541c38923

3
lib/certificates/README.md
View File

@ -1,3 +0,0 @@
We share root certificates with the nina-fw to ensure they both use the same roots.
https://github.com/adafruit/nina-fw

1
lib/certificates/nina-fw

@ -1 +0,0 @@
Subproject commit 21205e400515a698266abaaea902bd1ea897bb5d

2
ports/espressif/esp-idf-config/sdkconfig-esp32.defaults
View File

@ -776,7 +776,7 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE=y CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE=y
CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE=y CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE=y
CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="../../lib/certificates/nina-fw/data/roots.pem" CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="../../lib/certificates/data/roots.pem"
# end of Certificate Bundle # end of Certificate Bundle
CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_ECP_RESTARTABLE=y

2
ports/espressif/esp-idf-config/sdkconfig.defaults
View File

@ -572,7 +572,7 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE=y CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE=y
CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE=y CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE=y
CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="../../lib/certificates/nina-fw/data/roots.pem" CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="../../lib/certificates/data/roots.pem"
# end of Certificate Bundle # end of Certificate Bundle
CONFIG_MBEDTLS_ECP_RESTARTABLE=y CONFIG_MBEDTLS_ECP_RESTARTABLE=y

2
ports/raspberrypi/Makefile
View File

@ -345,7 +345,7 @@ CFLAGS += \
-isystem $(TOP)/lib/mbedtls/include \ -isystem $(TOP)/lib/mbedtls/include \
-DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"' \ -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"' \
$(BUILD)/x509_crt_bundle.S: $(TOP)/lib/certificates/nina-fw/data/roots.pem $(TOP)/tools/gen_crt_bundle.py $(BUILD)/x509_crt_bundle.S: $(TOP)/lib/certificates/data/roots.pem $(TOP)/tools/gen_crt_bundle.py
$(Q)$(PYTHON) $(TOP)/tools/gen_crt_bundle.py -i $< -o $@ --asm $(Q)$(PYTHON) $(TOP)/tools/gen_crt_bundle.py -i $< -o $@ --asm
OBJ_MBEDTLS := $(BUILD)/x509_crt_bundle.o OBJ_MBEDTLS := $(BUILD)/x509_crt_bundle.o
$(patsubst %.c,$(BUILD)/%.o,$(SRC_MBEDTLS))): CFLAGS += -Wno-suggest-attribute=format $(patsubst %.c,$(BUILD)/%.o,$(SRC_MBEDTLS))): CFLAGS += -Wno-suggest-attribute=format

4
tools/ci_fetch_deps.py
View File

@ -24,7 +24,7 @@ PORT_DEPS = {
"cxd56": ["extmod/ulab/", "lib/tinyusb/"], "cxd56": ["extmod/ulab/", "lib/tinyusb/"],
"espressif": [ "espressif": [
"extmod/ulab/", "extmod/ulab/",
"lib/certificates/nina-fw/", "lib/certificates/",
"lib/protomatter/", "lib/protomatter/",
"lib/quirc/", "lib/quirc/",
"lib/tinyusb/", "lib/tinyusb/",
@ -37,7 +37,7 @@ PORT_DEPS = {
"lib/adafruit_floppy/", "lib/adafruit_floppy/",
"lib/mbedtls/", "lib/mbedtls/",
"lib/mp3/", "lib/mp3/",
"lib/certificates/nina-fw/", "lib/certificates/",
"lib/protomatter/", "lib/protomatter/",
"lib/quirc/", "lib/quirc/",
"lib/tinyusb/", "lib/tinyusb/",