commit d7e350df7d13b41e35aa0eda04152caf3b2cb157
author David Brown <david.brown@linaro.org> Mon Apr 24 13:29:28 2017 -0600
committer David Brown <david.brown@linaro.org> Thu Apr 27 16:31:04 2017 -0600
tree 6fedd30c1d0d2c5ac7d4f2d9451531ba0b0b2d72
parent 3e1c38c62402dce09c2779b60f8aeb6d9d6bd060

zephyr: Fix up mbed TLS configuration

There are some problems with how mbed TLS is configured in Zephyr.
First, include the makefile stub in the Makefile that uses these
defines.  This makes sure the right definitions get made so that our
custom config gets used for all compiled files, rather than a mixed set.

Also, fix up the wrappers on the custom configs so that each is
different, making it easier to detect if multiple configs are being
included.

Lastly, only include the right header in the image validation.  The mbed
TLS includes don't seem to want to allow both RSA and ECDSA to be used
(due to the key size), and including the wrong header results in a
compilation error.

boot/bootutil/src/image_validate.c

diff --git a/boot/bootutil/src/image_validate.c b/boot/bootutil/src/image_validate.c
index 9ab08b7..c8ee2d6 100644
--- a/boot/bootutil/src/image_validate.c
+++ b/boot/bootutil/src/image_validate.c
@@ -29,8 +29,12 @@
 #include "bootutil/sign_key.h"
 
 #include "mbedtls/sha256.h"
+#if MYNEWT_VAL(BOOTUTIL_SIGN_RSA)
 #include "mbedtls/rsa.h"
+#endif
+#if MYNEWT_VAL(BOOTUTIL_SIGN_EC) || MYNEWT_VAL(BOOTUTIL_SIGN_EC256)
 #include "mbedtls/ecdsa.h"
+#endif
 #include "mbedtls/asn1.h"
 
 #include "bootutil_priv.h"