commit 410322f23e16c17a6bc42b93801ade286c0ad190
author Hanno Becker <hanno.becker@arm.com> Tue Jul 02 13:37:12 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Tue Jul 02 13:37:12 2019 +0100
tree 6c4b3045204e1f02d01cfdfbecf9e2f44b02a32d
parent 7ab8a2e2a0986708edd7603fe937024b4cc2e271

Fix guard controlling whether nested acquire calls are allowed

Resource counting as a safe-guard against nested acquire calls
is implemented if and only if MBEDTLS_X509_ALWAYS_FLUSH is disabled
_or_ MBEDTLS_THREADING_C is enabled.

library/x509_crt.c

diff --git a/library/x509_crt.c b/library/x509_crt.c
index 4f33d21..59898f7 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -193,7 +193,8 @@
 
     if( cache->frame != NULL )
     {
-#if !defined(MBEDTLS_X509_ALWAYS_FLUSH)
+#if !defined(MBEDTLS_X509_ALWAYS_FLUSH) ||      \
+    defined(MBEDTLS_THREADING_C)
         return( 0 );
 #else
         /* If MBEDTLS_X509_ALWAYS_FLUSH is set, we don't
@@ -253,7 +254,8 @@
 
     if( cache->pk != NULL )
     {
-#if !defined(MBEDTLS_X509_ALWAYS_FLUSH)
+#if !defined(MBEDTLS_X509_ALWAYS_FLUSH) ||      \
+    defined(MBEDTLS_THREADING_C)
         return( 0 );
 #else
         /* If MBEDTLS_X509_ALWAYS_FLUSH is set, we don't