yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-26 00:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add thread safety to ECP hardware acceleration

Browse Source 
The intended use of the abstraction layer for Elliptic Curve Point
arithmetic is to enable using hardware cryptographic accelerators.
These devices are a shared resource and the driver code rarely provides
thread safety.

This commit adds mutexes to the abstraction layer to protect the device
in a multi-threaded environment.
This commit is contained in:
Janos Follath 2016-11-03 14:25:37 +00:00 committed by Simon Butcher
parent 552f6b6d17
commit 430d3376c9
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
library/ecp.c
View File

@ -49,6 +49,7 @@
#if defined(MBEDTLS_ECP_C) #if defined(MBEDTLS_ECP_C)
#include "mbedtls/ecp.h" #include "mbedtls/ecp.h"
#include "mbedtls/threading.h"
#include <string.h> #include <string.h>
@ -1685,34 +1686,44 @@ int mbedtls_ecp_mul( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
( ret = mbedtls_ecp_check_pubkey( grp, P ) ) != 0 ) ( ret = mbedtls_ecp_check_pubkey( grp, P ) ) != 0 )
return( ret ); return( ret );
#if defined(MBEDTLS_ECP_FUNCTION_ALT) && defined(MBEDTLS_THREADING_C)
if( mbedtls_mutex_lock( &mbedtls_threading_cryptohw_asym_mutex ) != 0 )
return ( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
#endif
#if defined(MBEDTLS_ECP_INIT_ALT) #if defined(MBEDTLS_ECP_INIT_ALT)
if ( mbedtls_ecp_alt_grp_capable( grp ) ) if ( mbedtls_ecp_alt_grp_capable( grp ) )
{ {
MBEDTLS_MPI_CHK( mbedtls_ecp_alt_init( grp ) ); MBEDTLS_MPI_CHK( mbedtls_ecp_alt_init( grp ) );
} }
#endif
#endif
#if defined(ECP_MONTGOMERY) #if defined(ECP_MONTGOMERY)
if( ecp_get_type( grp ) == ECP_TYPE_MONTGOMERY ) if( ecp_get_type( grp ) == ECP_TYPE_MONTGOMERY )
ret = ecp_mul_mxz( grp, R, m, P, f_rng, p_rng ); ret = ecp_mul_mxz( grp, R, m, P, f_rng, p_rng );
#endif
#endif
#if defined(ECP_SHORTWEIERSTRASS) #if defined(ECP_SHORTWEIERSTRASS)
if( ecp_get_type( grp ) == ECP_TYPE_SHORT_WEIERSTRASS ) if( ecp_get_type( grp ) == ECP_TYPE_SHORT_WEIERSTRASS )
ret = ecp_mul_comb( grp, R, m, P, f_rng, p_rng ); ret = ecp_mul_comb( grp, R, m, P, f_rng, p_rng );
#endif
#endif
#if defined(MBEDTLS_ECP_INIT_ALT) #if defined(MBEDTLS_ECP_INIT_ALT)
cleanup: cleanup:
#endif
#endif
#if defined(MBEDTLS_ECP_DEINIT_ALT) #if defined(MBEDTLS_ECP_DEINIT_ALT)
if ( mbedtls_ecp_alt_grp_capable( grp ) ) if ( mbedtls_ecp_alt_grp_capable( grp ) )
{ {
mbedtls_ecp_alt_deinit( grp ); mbedtls_ecp_alt_deinit( grp );
} }
#endif
#endif
#if defined(MBEDTLS_ECP_FUNCTION_ALT) && defined(MBEDTLS_THREADING_C)
if( mbedtls_mutex_unlock( &mbedtls_threading_cryptohw_asym_mutex ) != 0 )
return ( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
#endif
return( ret ); return( ret );
} }
@ -1815,11 +1826,17 @@ int mbedtls_ecp_muladd( mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
MBEDTLS_MPI_CHK( mbedtls_ecp_mul_shortcuts( grp, &mP, m, P ) ); MBEDTLS_MPI_CHK( mbedtls_ecp_mul_shortcuts( grp, &mP, m, P ) );
MBEDTLS_MPI_CHK( mbedtls_ecp_mul_shortcuts( grp, R, n, Q ) ); MBEDTLS_MPI_CHK( mbedtls_ecp_mul_shortcuts( grp, R, n, Q ) );
#if defined(MBEDTLS_ECP_FUNCTION_ALT) && defined(MBEDTLS_THREADING_C)
if( mbedtls_mutex_lock( &mbedtls_threading_cryptohw_asym_mutex ) != 0 )
return ( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
#endif
#if defined(MBEDTLS_ECP_INIT_ALT) #if defined(MBEDTLS_ECP_INIT_ALT)
if ( mbedtls_ecp_alt_grp_capable( grp ) ) if ( mbedtls_ecp_alt_grp_capable( grp ) )
{ {
MBEDTLS_MPI_CHK( mbedtls_ecp_alt_init( grp ) ); MBEDTLS_MPI_CHK( mbedtls_ecp_alt_init( grp ) );
} }
#endif #endif
MBEDTLS_MPI_CHK( ecp_add_mixed( grp, R, &mP, R ) ); MBEDTLS_MPI_CHK( ecp_add_mixed( grp, R, &mP, R ) );
MBEDTLS_MPI_CHK( ecp_normalize_jac( grp, R ) ); MBEDTLS_MPI_CHK( ecp_normalize_jac( grp, R ) );
@ -1831,8 +1848,13 @@ cleanup:
{ {
mbedtls_ecp_alt_deinit( grp ); mbedtls_ecp_alt_deinit( grp );
} }
#endif
#endif
#if defined(MBEDTLS_ECP_FUNCTION_ALT) && defined(MBEDTLS_THREADING_C)
if( mbedtls_mutex_unlock( &mbedtls_threading_cryptohw_asym_mutex ) != 0 )
return ( MBEDTLS_ERR_THREADING_MUTEX_ERROR );
#endif
mbedtls_ecp_point_free( &mP ); mbedtls_ecp_point_free( &mP );
return( ret ); return( ret );