yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-23 17:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapt pthread implementation to recent changes

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-04-29 01:26:03 +02:00
parent eab147c4d0
commit 1e2eae02cb
3 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/mbedtls/threading.h
View file

@ -42,7 +42,11 @@ extern "C" {
#if defined(MBEDTLS_THREADING_PTHREAD) #if defined(MBEDTLS_THREADING_PTHREAD)
#include <pthread.h> #include <pthread.h>
typedef pthread_mutex_t mbedtls_threading_mutex_t; typedef struct
{
pthread_mutex_t mutex;
char is_valid;
} mbedtls_threading_mutex_t;
#endif #endif
#if defined(MBEDTLS_THREADING_ALT) #if defined(MBEDTLS_THREADING_ALT)

39
library/threading.c
View file

@ -31,34 +31,28 @@
#include "mbedtls/threading.h" #include "mbedtls/threading.h"
#if defined(MBEDTLS_THREADING_PTHREAD) #if defined(MBEDTLS_THREADING_PTHREAD)
static int threading_mutex_init_pthread( mbedtls_threading_mutex_t *mutex ) static void threading_mutex_init_pthread( mbedtls_threading_mutex_t *mutex )
{ {
if( mutex == NULL ) if( mutex == NULL )
return( MBEDTLS_ERR_THREADING_BAD_INPUT_DATA ); return;
if( pthread_mutex_init( mutex, NULL ) != 0 ) mutex->is_valid = pthread_mutex_init( &mutex->mutex, NULL ) == 0;
return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
return( 0 );
} }
static int threading_mutex_free_pthread( mbedtls_threading_mutex_t *mutex ) static void threading_mutex_free_pthread( mbedtls_threading_mutex_t *mutex )
{ {
if( mutex == NULL ) if( mutex == NULL )
return( MBEDTLS_ERR_THREADING_BAD_INPUT_DATA ); return;
if( pthread_mutex_destroy( mutex ) != 0 ) (void) pthread_mutex_destroy( &mutex->mutex );
return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
return( 0 );
} }
static int threading_mutex_lock_pthread( mbedtls_threading_mutex_t *mutex ) static int threading_mutex_lock_pthread( mbedtls_threading_mutex_t *mutex )
{ {
if( mutex == NULL ) if( mutex == NULL || ! mutex->is_valid )
return( MBEDTLS_ERR_THREADING_BAD_INPUT_DATA ); return( MBEDTLS_ERR_THREADING_BAD_INPUT_DATA );
if( pthread_mutex_lock( mutex ) != 0 ) if( pthread_mutex_lock( &mutex->mutex ) != 0 )
return( MBEDTLS_ERR_THREADING_MUTEX_ERROR ); return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
return( 0 ); return( 0 );
@ -66,17 +60,17 @@ static int threading_mutex_lock_pthread( mbedtls_threading_mutex_t *mutex )
static int threading_mutex_unlock_pthread( mbedtls_threading_mutex_t *mutex ) static int threading_mutex_unlock_pthread( mbedtls_threading_mutex_t *mutex )
{ {
if( mutex == NULL ) if( mutex == NULL || ! mutex->is_valid )
return( MBEDTLS_ERR_THREADING_BAD_INPUT_DATA ); return( MBEDTLS_ERR_THREADING_BAD_INPUT_DATA );
if( pthread_mutex_unlock( mutex ) != 0 ) if( pthread_mutex_unlock( &mutex->mutex ) != 0 )
return( MBEDTLS_ERR_THREADING_MUTEX_ERROR ); return( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
return( 0 ); return( 0 );
} }
int (*mbedtls_mutex_init)( mbedtls_threading_mutex_t * ) = threading_mutex_init_pthread; void (*mbedtls_mutex_init)( mbedtls_threading_mutex_t * ) = threading_mutex_init_pthread;
int (*mbedtls_mutex_free)( mbedtls_threading_mutex_t * ) = threading_mutex_free_pthread; void (*mbedtls_mutex_free)( mbedtls_threading_mutex_t * ) = threading_mutex_free_pthread;
int (*mbedtls_mutex_lock)( mbedtls_threading_mutex_t * ) = threading_mutex_lock_pthread; int (*mbedtls_mutex_lock)( mbedtls_threading_mutex_t * ) = threading_mutex_lock_pthread;
int (*mbedtls_mutex_unlock)( mbedtls_threading_mutex_t * ) = threading_mutex_unlock_pthread; int (*mbedtls_mutex_unlock)( mbedtls_threading_mutex_t * ) = threading_mutex_unlock_pthread;
#endif /* MBEDTLS_THREADING_PTHREAD */ #endif /* MBEDTLS_THREADING_PTHREAD */
@ -87,9 +81,14 @@ static int threading_mutex_fail( mbedtls_threading_mutex_t *mutex )
((void) mutex ); ((void) mutex );
return( MBEDTLS_ERR_THREADING_BAD_INPUT_DATA ); return( MBEDTLS_ERR_THREADING_BAD_INPUT_DATA );
} }
static void threading_mutex_dummy( mbedtls_threading_mutex_t *mutex )
{
((void) mutex );
return;
}
int (*mbedtls_mutex_init)( mbedtls_threading_mutex_t * ) = threading_mutex_fail; void (*mbedtls_mutex_init)( mbedtls_threading_mutex_t * ) = threading_mutex_dummy;
int (*mbedtls_mutex_free)( mbedtls_threading_mutex_t * ) = threading_mutex_fail; void (*mbedtls_mutex_free)( mbedtls_threading_mutex_t * ) = threading_mutex_dummy;
int (*mbedtls_mutex_lock)( mbedtls_threading_mutex_t * ) = threading_mutex_fail; int (*mbedtls_mutex_lock)( mbedtls_threading_mutex_t * ) = threading_mutex_fail;
int (*mbedtls_mutex_unlock)( mbedtls_threading_mutex_t * ) = threading_mutex_fail; int (*mbedtls_mutex_unlock)( mbedtls_threading_mutex_t * ) = threading_mutex_fail;

5
library/x509_crt.c
View file

@ -959,7 +959,10 @@ int mbedtls_x509_crt_parse_file( mbedtls_x509_crt *chain, const char *path )
} }
#if defined(MBEDTLS_THREADING_PTHREAD) #if defined(MBEDTLS_THREADING_PTHREAD)
static mbedtls_threading_mutex_t readdir_mutex = PTHREAD_MUTEX_INITIALIZER; static mbedtls_threading_mutex_t readdir_mutex = {
PTHREAD_MUTEX_INITIALIZER,
1
};
#endif #endif
int mbedtls_x509_crt_parse_path( mbedtls_x509_crt *chain, const char *path ) int mbedtls_x509_crt_parse_path( mbedtls_x509_crt *chain, const char *path )