commit 912e4471bb9b83db436d3ec5e8daea0d1859fbc3
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Mon Dec 18 11:44:07 2017 +0100
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Mon Dec 18 11:44:07 2017 +0100
tree 46582a55b71eec8baa7557c250ef8c82a17f9495
parent a15486a35f57529e72da4d1ac8fd649f8a46d553
parent 6ddfa370841eaa96d7817a5506d270d33a2b490b

Merge remote-tracking branch 'public/pr/1185' into mbedtls-2.1

* public/pr/1185:
  Fix build without MBEDTLS_FS_IO

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index 2664fe9..9cad2cd 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.
  *