eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix async support in ssl_server2

Browse source 
Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
This commit is contained in:
Manuel Pégourié-Gonnard 2021-06-16 12:08:34 +02:00
parent 8707259318
commit 6f19ce317b
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
programs/ssl/ssl_server2.c
View file

@ -525,6 +525,8 @@ int main( void )
(out_be)[(i) + 7] = (unsigned char)( ( (in_le) >> 0 ) & 0xFF ); \ (out_be)[(i) + 7] = (unsigned char)( ( (in_le) >> 0 ) & 0xFF ); \
} }
/* This is global so it can be easily accessed by callback functions */
rng_context_t rng;
/* /*
* global options * global options
@ -688,7 +690,7 @@ void sni_free( sni_entry *head )
* *
* Modifies the input string! This is not production quality! * Modifies the input string! This is not production quality!
*/ */
sni_entry *sni_parse( char *sni_string, rng_context_t *p_rng ) sni_entry *sni_parse( char *sni_string )
{ {
sni_entry *cur = NULL, *new = NULL; sni_entry *cur = NULL, *new = NULL;
char *p = sni_string; char *p = sni_string;
@ -727,7 +729,7 @@ sni_entry *sni_parse( char *sni_string, rng_context_t *p_rng )
mbedtls_pk_init( new->key ); mbedtls_pk_init( new->key );
if( mbedtls_x509_crt_parse_file( new->cert, crt_file ) != 0 || if( mbedtls_x509_crt_parse_file( new->cert, crt_file ) != 0 ||
mbedtls_pk_parse_keyfile( new->key, key_file, "", rng_get, p_rng ) != 0 ) mbedtls_pk_parse_keyfile( new->key, key_file, "", rng_get, &rng ) != 0 )
goto error; goto error;
if( strcmp( ca_file, "-" ) != 0 ) if( strcmp( ca_file, "-" ) != 0 )
@ -1045,7 +1047,8 @@ static int ssl_async_start( mbedtls_ssl_context *ssl,
for( slot = 0; slot < config_data->slots_used; slot++ ) for( slot = 0; slot < config_data->slots_used; slot++ )
{ {
if( mbedtls_pk_check_pair( &cert->pk, if( mbedtls_pk_check_pair( &cert->pk,
config_data->slots[slot].pk ) == 0 ) config_data->slots[slot].pk,
rng_get, &rng ) == 0 )
break; break;
} }
if( slot == config_data->slots_used ) if( slot == config_data->slots_used )
@ -1271,7 +1274,6 @@ int main( int argc, char *argv[] )
#if defined(MBEDTLS_X509_CRT_PARSE_C) #if defined(MBEDTLS_X509_CRT_PARSE_C)
mbedtls_x509_crt_profile crt_profile_for_test = mbedtls_x509_crt_profile_default; mbedtls_x509_crt_profile crt_profile_for_test = mbedtls_x509_crt_profile_default;
#endif #endif
rng_context_t rng;
mbedtls_ssl_context ssl; mbedtls_ssl_context ssl;
mbedtls_ssl_config conf; mbedtls_ssl_config conf;
#if defined(MBEDTLS_TIMING_C) #if defined(MBEDTLS_TIMING_C)
@ -2371,7 +2373,7 @@ int main( int argc, char *argv[] )
mbedtls_printf( " . Setting up SNI information..." ); mbedtls_printf( " . Setting up SNI information..." );
fflush( stdout ); fflush( stdout );
if( ( sni_info = sni_parse( opt.sni, &rng ) ) == NULL ) if( ( sni_info = sni_parse( opt.sni ) ) == NULL )
{ {
mbedtls_printf( " failed\n" ); mbedtls_printf( " failed\n" );
goto exit; goto exit;