diff options
| author | Dan Halbert <halbert@adafruit.com> | 2020-12-02 16:13:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 16:13:19 -0500 |
| commit | 348392f8ccc644383c578ca84b7bc662d284e04b (patch) | |
| tree | 4bac8b5a5617172ce7fd35ff048439e0c7931a82 | |
| parent | 9b3186b625184e6daf8df07636c15aa95b17dd71 (diff) | |
| parent | 9a9e972242e985b5528f0255217b641b065ecf74 (diff) | |
Merge pull request #3775 from tannewt/nina_certs
Use nina-fw root certs
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | conf.py | 1 | ||||
| -rw-r--r-- | ports/esp32s2/certificates/README.md | 3 | ||||
| m--------- | ports/esp32s2/certificates/nina-fw | 0 | ||||
| -rw-r--r-- | ports/esp32s2/esp-idf-config/sdkconfig.defaults | 7 |
5 files changed, 11 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index aaa66caf7..d36613d60 100644 --- a/.gitmodules +++ b/.gitmodules @@ -153,3 +153,6 @@ [submodule "ports/esp32s2/esp-idf"] path = ports/esp32s2/esp-idf url = https://github.com/jepler/esp-idf.git +[submodule "ports/esp32s2/certificates/nina-fw"] + path = ports/esp32s2/certificates/nina-fw + url = https://github.com/adafruit/nina-fw.git @@ -172,6 +172,7 @@ exclude_patterns = ["**/build*", "ports/atmel-samd/tools", "ports/cxd56/mkspk", "ports/cxd56/spresense-exported-sdk", + "ports/esp32s2/certificates", "ports/esp32s2/esp-idf", "ports/esp32s2/peripherals", "ports/litex/hw", diff --git a/ports/esp32s2/certificates/README.md b/ports/esp32s2/certificates/README.md new file mode 100644 index 000000000..dd5cf25b0 --- /dev/null +++ b/ports/esp32s2/certificates/README.md @@ -0,0 +1,3 @@ +We share root certificates with the nina-fw to ensure they both use the same roots. + +https://github.com/adafruit/nina-fw diff --git a/ports/esp32s2/certificates/nina-fw b/ports/esp32s2/certificates/nina-fw new file mode 160000 +Subproject f2a0e601b23212dda4fe305eab30af49a7c7fb4 diff --git a/ports/esp32s2/esp-idf-config/sdkconfig.defaults b/ports/esp32s2/esp-idf-config/sdkconfig.defaults index 2c53da108..cc59e2a7e 100644 --- a/ports/esp32s2/esp-idf-config/sdkconfig.defaults +++ b/ports/esp32s2/esp-idf-config/sdkconfig.defaults @@ -575,10 +575,11 @@ CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y # Certificate Bundle # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=y -CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=y +# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL is not set # CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN is not set -# CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE is not set -# CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE is not set +CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_NONE=y +CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE=y +CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH="certificates/nina-fw/data/roots.pem" # end of Certificate Bundle # CONFIG_MBEDTLS_ECP_RESTARTABLE is not set |