Skip to content

Commit 348392f

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#3775 from tannewt/nina_certs
Use nina-fw root certs
2 parents 9b3186b + 9a9e972 commit 348392f

5 files changed

Lines changed: 12 additions & 3 deletions

File tree

‎.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/jepler/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

‎conf.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@
172172
"ports/atmel-samd/tools",
173173
"ports/cxd56/mkspk",
174174
"ports/cxd56/spresense-exported-sdk",
175+
"ports/esp32s2/certificates",
175176
"ports/esp32s2/esp-idf",
176177
"ports/esp32s2/peripherals",
177178
"ports/litex/hw",

‎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/esp-idf-config/sdkconfig.defaults‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -575,10 +575,11 @@ CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y
575575
# Certificate Bundle
576576
#
577577
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y
578-
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=y
578+
# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL is not set
579579
# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set
580-
# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE is not set
581-
# CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE is not set
580+
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE=y
581+
CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE=y
582+
CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="certificates/nina-fw/data/roots.pem"
582583
# end of Certificate Bundle
583584

584585
# CONFIG_MBEDTLS_ECP_RESTARTABLE is not set

0 commit comments

Comments
 (0)