From: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Date: Tue, 6 Jun 2017 09:54:39 +0000 (+0100)
Subject: mbedtls: Don't use tf_snprintf if option not defined
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c46c18c598b3cb0a71965a6681a30205abf5aeb2;p=project%2Fbcm63xx%2Fatf.git

mbedtls: Don't use tf_snprintf if option not defined

If `MBEDTLS_PLATFORM_SNPRINTF_ALT` isn't used, the function
`mbedtls_platform_set_snprintf()` isn't defined.

In case a platform uses a different mbed TLS configuration file than
the one provided by the Trusted Firmware, and it doesn't define the
mentioned build option, this will result in a build error.

This patch modifies the initialization code so that
`mbedtls_platform_set_snprintf()` is only used if
`MBEDTLS_PLATFORM_SNPRINTF_ALT` is defined, allowing platforms to use
it or not depending on their needs.

Change-Id: I1d5c86d57e9b2871ba463030bf89210ebec5178e
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
---

diff --git a/drivers/auth/mbedtls/mbedtls_common.c b/drivers/auth/mbedtls/mbedtls_common.c
index 336e44be..a7e5b97e 100644
--- a/drivers/auth/mbedtls/mbedtls_common.c
+++ b/drivers/auth/mbedtls/mbedtls_common.c
@@ -9,6 +9,7 @@
 /* mbed TLS headers */
 #include <mbedtls/memory_buffer_alloc.h>
 #include <mbedtls/platform.h>
+#include <mbedtls_config.h>
 
 /*
  * mbed TLS heap
@@ -31,8 +32,10 @@ void mbedtls_init(void)
 		/* Initialize the mbed TLS heap */
 		mbedtls_memory_buffer_alloc_init(heap, MBEDTLS_HEAP_SIZE);
 
+#ifdef MBEDTLS_PLATFORM_SNPRINTF_ALT
 		/* Use reduced version of snprintf to save space. */
 		mbedtls_platform_set_snprintf(tf_snprintf);
+#endif
 
 		ready = 1;
 	}