diff --git a/programs/ssl/ssl_test_common_source.c b/programs/ssl/ssl_test_common_source.c index 9f47389b0de2..cce90ab1a1c2 100644 --- a/programs/ssl/ssl_test_common_source.c +++ b/programs/ssl/ssl_test_common_source.c @@ -37,16 +37,14 @@ void eap_tls_key_derivation( void *p_expkey, /* We're only interested in the TLS 1.2 master secret */ if( secret_type != MBEDTLS_SSL_KEY_EXPORT_TLS12_MASTER_SECRET ) - return( 0 ); + return; if( secret_len != sizeof( keys->master_secret ) ) - return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA ); + return; memcpy( keys->master_secret, secret, sizeof( keys->master_secret ) ); memcpy( keys->randbytes, client_random, 32 ); memcpy( keys->randbytes + 32, server_random, 32 ); keys->tls_prf_type = tls_prf_type; - - return( 0 ); } void nss_keylog_export( void *p_expkey, @@ -65,7 +63,7 @@ void nss_keylog_export( void *p_expkey, /* We're only interested in the TLS 1.2 master secret */ if( secret_type != MBEDTLS_SSL_KEY_EXPORT_TLS12_MASTER_SECRET ) - return( 0 ); + return; ((void) p_expkey); ((void) server_random); @@ -119,7 +117,6 @@ void nss_keylog_export( void *p_expkey, exit: mbedtls_platform_zeroize( nss_keylog_line, sizeof( nss_keylog_line ) ); - return( ret ); } #if defined( MBEDTLS_SSL_DTLS_SRTP ) @@ -135,16 +132,14 @@ void dtls_srtp_key_derivation( void *p_expkey, /* We're only interested in the TLS 1.2 master secret */ if( secret_type != MBEDTLS_SSL_KEY_EXPORT_TLS12_MASTER_SECRET ) - return( 0 ); + return; if( secret_len != sizeof( keys->master_secret ) ) - return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA ); + return; memcpy( keys->master_secret, secret, sizeof( keys->master_secret ) ); memcpy( keys->randbytes, client_random, 32 ); memcpy( keys->randbytes + 32, server_random, 32 ); keys->tls_prf_type = tls_prf_type; - - return( 0 ); } #endif /* MBEDTLS_SSL_DTLS_SRTP */