1
0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00

Merge pull request #4845 from mstarzyk-mobica/ecb-alt-ret-2.2x

Backport 2.2x: Catch failures of mbedtls_aes_crypt_ecb and its DES equivalents
This commit is contained in:
Gilles Peskine
2021-10-14 12:11:04 +02:00
committed by GitHub
14 changed files with 335 additions and 62 deletions

View File

@ -770,6 +770,14 @@ int query_config( const char *config )
}
#endif /* MBEDTLS_CAMELLIA_SMALL_MEMORY */
#if defined(MBEDTLS_CHECK_RETURN_WARNING)
if( strcmp( "MBEDTLS_CHECK_RETURN_WARNING", config ) == 0 )
{
MACRO_EXPANSION_TO_STR( MBEDTLS_CHECK_RETURN_WARNING );
return( 0 );
}
#endif /* MBEDTLS_CHECK_RETURN_WARNING */
#if defined(MBEDTLS_CIPHER_MODE_CBC)
if( strcmp( "MBEDTLS_CIPHER_MODE_CBC", config ) == 0 )
{
@ -2642,6 +2650,22 @@ int query_config( const char *config )
}
#endif /* MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO */
#if defined(MBEDTLS_CHECK_RETURN)
if( strcmp( "MBEDTLS_CHECK_RETURN", config ) == 0 )
{
MACRO_EXPANSION_TO_STR( MBEDTLS_CHECK_RETURN );
return( 0 );
}
#endif /* MBEDTLS_CHECK_RETURN */
#if defined(MBEDTLS_IGNORE_RETURN)
if( strcmp( "MBEDTLS_IGNORE_RETURN", config ) == 0 )
{
MACRO_EXPANSION_TO_STR( MBEDTLS_IGNORE_RETURN );
return( 0 );
}
#endif /* MBEDTLS_IGNORE_RETURN */
#if defined(MBEDTLS_PSA_HMAC_DRBG_MD_TYPE)
if( strcmp( "MBEDTLS_PSA_HMAC_DRBG_MD_TYPE", config ) == 0 )
{