mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-07-30 22:43:08 +03:00
Merge remote-tracking branch 'origin/development' into development_new
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com> Conflicts: include/mbedtls/check_config.h: nearby edits library/entropy.c: nearby edits programs/random/gen_random_havege.c: modification vs. removal programs/ssl/ssl_test_lib.h: nearby edits programs/test/cpp_dummy_build.cpp: nearby edits visualc/VS2010/mbedTLS.vcxproj: automatically generated file, regenerated with scripts/generate_visualc_files.pl
This commit is contained in:
@ -819,6 +819,15 @@ int mbedtls_gcm_self_test( int verbose )
|
||||
add_len_test_data[i],
|
||||
pt_test_data[pt_index_test_data[i]],
|
||||
buf, 16, tag_buf );
|
||||
#if defined(MBEDTLS_GCM_ALT)
|
||||
/* Allow alternative implementations to only support 12-byte nonces. */
|
||||
if( ret == MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED &&
|
||||
iv_len_test_data[i] != 12 )
|
||||
{
|
||||
mbedtls_printf( "skipped\n" );
|
||||
break;
|
||||
}
|
||||
#endif /* defined(MBEDTLS_GCM_ALT) */
|
||||
if( ret != 0 )
|
||||
goto exit;
|
||||
|
||||
|
Reference in New Issue
Block a user