commit 944cfe8899062ce6a810c0b891da78a2737e414a
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed May 27 20:07:18 2015 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed May 27 20:12:05 2015 +0200
tree 180a3ccfcee4a06dcb242cfe61def76e8ebbbfac
parent f7c2eebfcf87b003ef3ee956728d41adb9a46290

Allow use of global mutexes with threading_alt

library/x509_crt.c

diff --git a/library/x509_crt.c b/library/x509_crt.c
index d1749b9..e46c934 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -963,13 +963,6 @@
     return( ret );
 }
 
-#if defined(MBEDTLS_THREADING_PTHREAD)
-static mbedtls_threading_mutex_t readdir_mutex = {
-    PTHREAD_MUTEX_INITIALIZER,
-    1
-};
-#endif
-
 int mbedtls_x509_crt_parse_path( mbedtls_x509_crt *chain, const char *path )
 {
     int ret = 0;
@@ -1040,7 +1033,7 @@
         return( MBEDTLS_ERR_X509_FILE_IO_ERROR );
 
 #if defined(MBEDTLS_THREADING_PTHREAD)
-    if( ( ret = mbedtls_mutex_lock( &readdir_mutex ) ) != 0 )
+    if( ( ret = mbedtls_mutex_lock( &mbedtls_threading_readdir_mutex ) ) != 0 )
         return( ret );
 #endif
 
@@ -1070,7 +1063,7 @@
 
 cleanup:
 #if defined(MBEDTLS_THREADING_PTHREAD)
-    if( mbedtls_mutex_unlock( &readdir_mutex ) != 0 )
+    if( mbedtls_mutex_unlock( &mbedtls_threading_readdir_mutex ) != 0 )
         ret = MBEDTLS_ERR_THREADING_MUTEX_ERROR;
 #endif