commit 8b4cd26eafe0c34cd2a9df59724b45b52f3a111c
author Jaeden Amero <jaeden.amero@arm.com> Wed Mar 28 13:44:28 2018 +0100
committer Jaeden Amero <jaeden.amero@arm.com> Wed Mar 28 13:44:28 2018 +0100
tree aaea839a9b942f24220bd1b63956c2f5c9239170
parent 7eaea0b12b048a5ee20ba1d237775483f4d56486
parent 2a0aee3163793b16789671dce490fb2a08ffad5c

Merge remote-tracking branch 'upstream-public/pr/1481' into mbedtls-2.1-proposed

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 63e084a..853e557 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
    * Improve testing in configurations that omit certain hashes or
      public-key algorithms. Includes contributions by Gert van Dijk.
    * Improve negative testing of X.509 parsing.
+   * Do not define global mutexes around readdir() and gmtime() in
+     configurations where the feature is disabled. Found and fixed by Gergely
+     Budai.
 
 = mbed TLS 2.1.11 branch released 2018-03-16
 

include/mbedtls/threading.h

diff --git a/include/mbedtls/threading.h b/include/mbedtls/threading.h
index c39cbf2..3218f5c 100644
--- a/include/mbedtls/threading.h
+++ b/include/mbedtls/threading.h
@@ -81,6 +81,7 @@
 void mbedtls_threading_free_alt( void );
 #endif /* MBEDTLS_THREADING_ALT */
 
+#if defined(MBEDTLS_THREADING_C)
 /*
  * The function pointers for mutex_init, mutex_free, mutex_ and mutex_unlock
  *
@@ -94,8 +95,13 @@
 /*
  * Global mutexes
  */
+#if defined(MBEDTLS_FS_IO)
 extern mbedtls_threading_mutex_t mbedtls_threading_readdir_mutex;
+#endif
+#if defined(MBEDTLS_HAVE_TIME_DATE)
 extern mbedtls_threading_mutex_t mbedtls_threading_gmtime_mutex;
+#endif
+#endif /* MBEDTLS_THREADING_C */
 
 #ifdef __cplusplus
 }

library/threading.c

diff --git a/library/threading.c b/library/threading.c
index 0758675..f1c3724 100644
--- a/library/threading.c
+++ b/library/threading.c
@@ -111,8 +111,12 @@
     mbedtls_mutex_lock = mutex_lock;
     mbedtls_mutex_unlock = mutex_unlock;
 
+#if defined(MBEDTLS_FS_IO)
     mbedtls_mutex_init( &mbedtls_threading_readdir_mutex );
+#endif
+#if defined(MBEDTLS_HAVE_TIME_DATE)
     mbedtls_mutex_init( &mbedtls_threading_gmtime_mutex );
+#endif
 }
 
 /*
@@ -120,8 +124,12 @@
  */
 void mbedtls_threading_free_alt( void )
 {
+#if defined(MBEDTLS_FS_IO)
     mbedtls_mutex_free( &mbedtls_threading_readdir_mutex );
+#endif
+#if defined(MBEDTLS_HAVE_TIME_DATE)
     mbedtls_mutex_free( &mbedtls_threading_gmtime_mutex );
+#endif
 }
 #endif /* MBEDTLS_THREADING_ALT */
 
@@ -131,7 +139,11 @@
 #ifndef MUTEX_INIT
 #define MUTEX_INIT
 #endif
+#if defined(MBEDTLS_FS_IO)
 mbedtls_threading_mutex_t mbedtls_threading_readdir_mutex MUTEX_INIT;
+#endif
+#if defined(MBEDTLS_HAVE_TIME_DATE)
 mbedtls_threading_mutex_t mbedtls_threading_gmtime_mutex MUTEX_INIT;
+#endif
 
 #endif /* MBEDTLS_THREADING_C */