commit 3fe67dae0b571862a011028ab3de0d4698a6f7f0
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Mon Dec 18 11:44:26 2017 +0100
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Mon Dec 18 11:44:26 2017 +0100
tree 33b8ec9c83b381e3a90e5cc150d68187f79174e5
parent 92e6a0e71a8708fa8c810f1aca08081d3273c97e
parent 912e4471bb9b83db436d3ec5e8daea0d1859fbc3

Merge branch 'mbedtls-2.1' into mbedtls-2.1-restricted

* mbedtls-2.1:
  Fix build without MBEDTLS_FS_IO

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index 361747f..eb92da4 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -60,12 +60,15 @@
 #define mbedtls_free       free
 #endif
 
-#if defined(MBEDTLS_FS_IO)
+#if defined(MBEDTLS_FS_IO) || \
+    defined(MBEDTLS_PKCS12_C) || defined(MBEDTLS_PKCS5_C)
 /* Implementation that should never be optimized out by the compiler */
 static void mbedtls_zeroize( void *v, size_t n ) {
     volatile unsigned char *p = v; while( n-- ) *p++ = 0;
 }
+#endif
 
+#if defined(MBEDTLS_FS_IO)
 /*
  * Load all data from a file into a given buffer.
  *