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>

sim/mcuboot-sys/build.rs

diff --git a/sim/mcuboot-sys/build.rs b/sim/mcuboot-sys/build.rs
index 922219f..7c1db9e 100644
--- a/sim/mcuboot-sys/build.rs
+++ b/sim/mcuboot-sys/build.rs
@@ -70,7 +70,7 @@
         conf.define("MCUBOOT_USE_TINYCRYPT", None);
 
         if !enc_kw {
-            conf.include("../../ext/mbedtls/include");
+            conf.include("../../ext/mbedtls-asn1/include");
         }
         conf.include("../../ext/tinycrypt/lib/include");
 
@@ -82,8 +82,8 @@
         conf.file("../../ext/tinycrypt/lib/source/ecc_dsa.c");
         conf.file("../../ext/tinycrypt/lib/source/ecc_platform_specific.c");
 
-        conf.file("../../ext/mbedtls/src/platform_util.c");
-        conf.file("../../ext/mbedtls/src/asn1parse.c");
+        conf.file("../../ext/mbedtls-asn1/src/platform_util.c");
+        conf.file("../../ext/mbedtls-asn1/src/asn1parse.c");
     } else if sig_ed25519 {
         conf.define("MCUBOOT_SIGN_ED25519", None);
         conf.define("MCUBOOT_USE_MBED_TLS", None);
@@ -208,7 +208,7 @@
 
     walk_dir("../../boot").unwrap();
     walk_dir("../../ext/tinycrypt/lib/source").unwrap();
-    walk_dir("../../ext/mbedtls").unwrap();
+    walk_dir("../../ext/mbedtls-asn1").unwrap();
     walk_dir("csupport").unwrap();
     walk_dir("mbedtls/include").unwrap();
     walk_dir("mbedtls/library").unwrap();