commit b748f6fa2aa21b9e5b71e6506cce7d6494f9f14b
author David Brown <david.brown@linaro.org> Fri Oct 11 10:07:31 2019 -0600
committer David Brown <davidb@davidb.org> Tue Oct 15 09:29:20 2019 -0600
tree 7f776b5417751c78bd49499ce4c86daef18432b5
parent 1b7777b476ff09eae1e45e821b5fa43a265673f4

Rename ext/mbedtls to ext/mbedtls-asn1

The ext/mbedtls directory has a copy of the ASN.1 parser from the mbed
TLS library.  To allow a future change to bring the entire mbed TLS
library in as a submodule under ext, rename this to mbedtls-asn1 to make
it clear this is only a subset.

Signed-off-by: David Brown <david.brown@linaro.org>

boot/bootutil/pkg.yml

diff --git a/boot/bootutil/pkg.yml b/boot/bootutil/pkg.yml
index 506bfcf..310b83b 100644
--- a/boot/bootutil/pkg.yml
+++ b/boot/bootutil/pkg.yml
@@ -46,7 +46,7 @@
 
 pkg.deps.BOOTUTIL_USE_TINYCRYPT:
     - "@mcuboot/ext/tinycrypt/lib"
-    - "@mcuboot/ext/mbedtls"
+    - "@mcuboot/ext/mbedtls-asn1"
 
 pkg.deps.BOOTUTIL_SIGN_ED25519:
     - "@apache-mynewt-core/crypto/mbedtls"

boot/zephyr/CMakeLists.txt

diff --git a/boot/zephyr/CMakeLists.txt b/boot/zephyr/CMakeLists.txt
index ded117d..f5e02c7 100644
--- a/boot/zephyr/CMakeLists.txt
+++ b/boot/zephyr/CMakeLists.txt
@@ -66,7 +66,7 @@
 set(FIAT_DIR "${MCUBOOT_DIR}/ext/fiat")
 assert_exists(FIAT_DIR)
 # Path to mbed-tls' asn1 parser library.
-set(MBEDTLS_ASN1_DIR "${MCUBOOT_DIR}/ext/mbedtls")
+set(MBEDTLS_ASN1_DIR "${MCUBOOT_DIR}/ext/mbedtls-asn1")
 assert_exists(MBEDTLS_ASN1_DIR)
 set(NRF_DIR "${MCUBOOT_DIR}/ext/nrf")