Merge branch 'mbedtls-1.3' into mbedtls-1.3-restricted

* mbedtls-1.3:
  Fix build without MBEDTLS_FS_IO
This commit is contained in:
Manuel Pégourié-Gonnard 2017-12-18 11:45:06 +01:00
commit 917969e533

View file

@ -61,12 +61,15 @@
#define polarssl_free free
#endif
#if defined(POLARSSL_FS_IO)
#if defined(POLARSSL_FS_IO) || \
defined(POLARSSL_PKCS12_C) || defined(POLARSSL_PKCS5_C)
/* Implementation that should never be optimized out by the compiler */
static void polarssl_zeroize( void *v, size_t n ) {
volatile unsigned char *p = v; while( n-- ) *p++ = 0;
}
#endif
#if defined(POLARSSL_FS_IO)
/*
* Load all data from a file into a given buffer.
*/