Skip to content

Commit

Permalink
Merge pull request #3282 from gabor-mezei-arm/2905_missing_cleanup_in…
Browse files Browse the repository at this point in the history 
…_ssl_tests

Force cleanup by using goto exit instead of direct return
  • Loading branch information
@gilles-peskine-arm
gilles-peskine-arm authored Oct 5, 2020
2 parents 0dfcefb + de47217 commit d4d1ab1
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 15 deletions.
25 changes: 19 additions & 6 deletions programs/ssl/ssl_client2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ int main( void )
#define DFL_NSS_KEYLOG 0
#define DFL_NSS_KEYLOG_FILE NULL
#define DFL_SKIP_CLOSE_NOTIFY 0
#define DFL_QUERY_CONFIG_MODE 0

#define GET_REQUEST "GET %s HTTP/1.0\r\nExtra-header: "
#define GET_REQUEST_END "\r\n\r\n"
Expand Down Expand Up @@ -539,6 +540,7 @@ struct options
* after renegotiation */
int reproducible; /* make communication reproducible */
int skip_close_notify; /* skip sending the close_notify alert */
int query_config_mode; /* whether to read config */
} opt;

int query_config( const char *config );
Expand Down Expand Up @@ -1102,6 +1104,7 @@ int report_cid_usage( mbedtls_ssl_context *ssl,
int main( int argc, char *argv[] )
{
int ret = 0, len, tail_len, i, written, frags, retry_left;
int query_config_ret = 0;
mbedtls_net_context server_fd;
io_ctx_t io_ctx;

Expand Down Expand Up @@ -1300,6 +1303,7 @@ int main( int argc, char *argv[] )
opt.nss_keylog = DFL_NSS_KEYLOG;
opt.nss_keylog_file = DFL_NSS_KEYLOG_FILE;
opt.skip_close_notify = DFL_SKIP_CLOSE_NOTIFY;
opt.query_config_mode = DFL_QUERY_CONFIG_MODE;

for( i = 1; i < argc; i++ )
{
Expand Down Expand Up @@ -1686,7 +1690,9 @@ int main( int argc, char *argv[] )
}
else if( strcmp( p, "query_config" ) == 0 )
{
mbedtls_exit( query_config( q ) );
opt.query_config_mode = 1;
query_config_ret = query_config( q );
goto exit;
}
else if( strcmp( p, "serialize") == 0 )
{
Expand Down Expand Up @@ -2685,7 +2691,7 @@ int main( int argc, char *argv[] )
{
mbedtls_printf( " failed\n ! mbedtls_ssl_set_cid returned %d\n\n",
ret );
return( ret );
goto exit;
}
}
#endif /* MBEDTLS_SSL_DTLS_CONNECTION_ID */
Expand Down Expand Up @@ -3348,7 +3354,8 @@ int main( int argc, char *argv[] )
* immediately because of bad cmd line params,
* for example). */
status = psa_destroy_key( slot );
if( status != PSA_SUCCESS )
if( ( status != PSA_SUCCESS ) &&
( opt.query_config_mode == DFL_QUERY_CONFIG_MODE ) )
{
mbedtls_printf( "Failed to destroy key slot %u - error was %d",
(unsigned) slot, (int) status );
Expand All @@ -3367,15 +3374,21 @@ int main( int argc, char *argv[] )
#endif

#if defined(_WIN32)
mbedtls_printf( " + Press Enter to exit this program.\n" );
fflush( stdout ); getchar();
if( opt.query_config_mode == DFL_QUERY_CONFIG_MODE )
{
mbedtls_printf( " + Press Enter to exit this program.\n" );
fflush( stdout ); getchar();
}
#endif

// Shell can not handle large exit numbers -> 1 for errors
if( ret < 0 )
ret = 1;

mbedtls_exit( ret );
if( opt.query_config_mode == DFL_QUERY_CONFIG_MODE )
mbedtls_exit( ret );
else
mbedtls_exit( query_config_ret );
}
#endif /* MBEDTLS_BIGNUM_C && MBEDTLS_ENTROPY_C && MBEDTLS_SSL_TLS_C &&
MBEDTLS_SSL_CLI_C && MBEDTLS_NET_C && MBEDTLS_RSA_C &&
Expand Down
35 changes: 26 additions & 9 deletions programs/ssl/ssl_server2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ int main( void )
#define DFL_REPRODUCIBLE 0
#define DFL_NSS_KEYLOG 0
#define DFL_NSS_KEYLOG_FILE NULL
#define DFL_QUERY_CONFIG_MODE 0

#define LONG_RESPONSE "<p>01-blah-blah-blah-blah-blah-blah-blah-blah-blah\r\n" \
"02-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah-blah\r\n" \
Expand Down Expand Up @@ -643,6 +644,7 @@ struct options
const char *cid_val_renego; /* the CID to use for incoming messages
* after renegotiation */
int reproducible; /* make communication reproducible */
int query_config_mode; /* whether to read config */
} opt;

int query_config( const char *config );
Expand Down Expand Up @@ -1723,6 +1725,7 @@ int report_cid_usage( mbedtls_ssl_context *ssl,
int main( int argc, char *argv[] )
{
int ret = 0, len, written, frags, exchanges_left;
int query_config_ret = 0;
int version_suites[4][2];
io_ctx_t io_ctx;
unsigned char* buf = 0;
Expand Down Expand Up @@ -1972,6 +1975,7 @@ int main( int argc, char *argv[] )
opt.reproducible = DFL_REPRODUCIBLE;
opt.nss_keylog = DFL_NSS_KEYLOG;
opt.nss_keylog_file = DFL_NSS_KEYLOG_FILE;
opt.query_config_mode = DFL_QUERY_CONFIG_MODE;

for( i = 1; i < argc; i++ )
{
Expand Down Expand Up @@ -2386,7 +2390,9 @@ int main( int argc, char *argv[] )
}
else if( strcmp( p, "query_config" ) == 0 )
{
mbedtls_exit( query_config( q ) );
opt.query_config_mode = 1;
query_config_ret = query_config( q );
goto exit;
}
else if( strcmp( p, "serialize") == 0 )
{
Expand Down Expand Up @@ -4261,8 +4267,11 @@ int main( int argc, char *argv[] )
}
#endif

mbedtls_printf( " . Cleaning up..." );
fflush( stdout );
if( opt.query_config_mode == DFL_QUERY_CONFIG_MODE )
{
mbedtls_printf( " . Cleaning up..." );
fflush( stdout );
}

mbedtls_net_free( &client_fd );
mbedtls_net_free( &listen_fd );
Expand Down Expand Up @@ -4292,7 +4301,8 @@ int main( int argc, char *argv[] )
sni_free( sni_info );
#endif
#if defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
if( ( ret = psk_free( psk_info ) ) != 0 )
ret = psk_free( psk_info );
if( ( ret != 0 ) && ( opt.query_config_mode == DFL_QUERY_CONFIG_MODE ) )
mbedtls_printf( "Failed to list of opaque PSKs - error was %d\n", ret );
#endif
#if defined(MBEDTLS_DHM_C) && defined(MBEDTLS_FS_IO)
Expand All @@ -4308,7 +4318,8 @@ int main( int argc, char *argv[] )
* immediately because of bad cmd line params,
* for example). */
status = psa_destroy_key( psk_slot );
if( status != PSA_SUCCESS )
if( ( status != PSA_SUCCESS ) &&
( opt.query_config_mode == DFL_QUERY_CONFIG_MODE ) )
{
mbedtls_printf( "Failed to destroy key slot %u - error was %d",
(unsigned) psk_slot, (int) status );
Expand Down Expand Up @@ -4347,18 +4358,24 @@ int main( int argc, char *argv[] )
mbedtls_memory_buffer_alloc_free();
#endif

mbedtls_printf( " done.\n" );
if( opt.query_config_mode == DFL_QUERY_CONFIG_MODE )
{
mbedtls_printf( " done.\n" );

#if defined(_WIN32)
mbedtls_printf( " + Press Enter to exit this program.\n" );
fflush( stdout ); getchar();
mbedtls_printf( " + Press Enter to exit this program.\n" );
fflush( stdout ); getchar();
#endif
}

// Shell can not handle large exit numbers -> 1 for errors
if( ret < 0 )
ret = 1;

mbedtls_exit( ret );
if( opt.query_config_mode == DFL_QUERY_CONFIG_MODE )
mbedtls_exit( ret );
else
mbedtls_exit( query_config_ret );
}
#endif /* MBEDTLS_BIGNUM_C && MBEDTLS_ENTROPY_C && MBEDTLS_SSL_TLS_C &&
MBEDTLS_SSL_SRV_C && MBEDTLS_NET_C && MBEDTLS_RSA_C &&
Expand Down

0 comments on commit d4d1ab1

Please sign in to comment.