From 9eae7aae80c5e9c7a6b798b3930e00b53c063604 Mon Sep 17 00:00:00 2001 From: Paul Bakker Date: Thu, 6 Feb 2014 14:51:53 +0100 Subject: [PATCH] Mutex call in x509_crt.c depended on PTHREAD specific instead of generic threading --- ChangeLog | 1 + library/x509_crt.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06f103605..de16609cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ Bugfix * ecp_gen_keypair() does more tries to prevent failure because of statistics * Fix buf in RSA PKCS#1 v1.5 "reversed" operations + * Threading in x509_crt depended on PTHREAD instead of generic = PolarSSL 1.3.4 released on 2014-01-27 Features diff --git a/library/x509_crt.c b/library/x509_crt.c index 4c79a7a6c..1d8111926 100644 --- a/library/x509_crt.c +++ b/library/x509_crt.c @@ -952,7 +952,7 @@ int x509_crt_parse_file( x509_crt *chain, const char *path ) return( ret ); } -#if defined(POLARSSL_THREADING_PTHREAD) +#if defined(POLARSSL_THREADING_C) static threading_mutex_t readdir_mutex = PTHREAD_MUTEX_INITIALIZER; #endif @@ -1020,7 +1020,7 @@ int x509_crt_parse_path( x509_crt *chain, const char *path ) if( dir == NULL) return( POLARSSL_ERR_X509_FILE_IO_ERROR ); -#if defined(POLARSSL_THREADING_PTHREAD) +#if defined(POLARSSL_THREADING_C) if( ( ret = polarssl_mutex_lock( &readdir_mutex ) ) != 0 ) return( ret ); #endif @@ -1050,7 +1050,7 @@ int x509_crt_parse_path( x509_crt *chain, const char *path ) closedir( dir ); cleanup: -#if defined(POLARSSL_THREADING_PTHREAD) +#if defined(POLARSSL_THREADING_C) if( polarssl_mutex_unlock( &readdir_mutex ) != 0 ) ret = POLARSSL_ERR_THREADING_MUTEX_ERROR; #endif