lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-08 17:42:09 +03:00
Code Activity

Merge pull request #5740 from gilles-peskine-arm/psa-crypto-config-file-2.28

Browse Source 
Backport 2.28: Support alternative MBEDTLS_PSA_CRYPTO_CONFIG_FILE
This commit is contained in:
Gilles Peskine
2022-04-28 18:17:45 +02:00
committed by GitHub
parent 4d6070ca6d 238f976ad1
commit f87d84361c
6 changed files with 208 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
programs/test/query_config.c
View File

@@ -2320,6 +2320,38 @@ int query_config( const char *config )
}
#endif /* MBEDTLS_XTEA_C */
#if defined(MBEDTLS_CONFIG_FILE)
if( strcmp( "MBEDTLS_CONFIG_FILE", config ) == 0 )
{
MACRO_EXPANSION_TO_STR( MBEDTLS_CONFIG_FILE );
return( 0 );
}
#endif /* MBEDTLS_CONFIG_FILE */
#if defined(MBEDTLS_USER_CONFIG_FILE)
if( strcmp( "MBEDTLS_USER_CONFIG_FILE", config ) == 0 )
{
MACRO_EXPANSION_TO_STR( MBEDTLS_USER_CONFIG_FILE );
return( 0 );
}
#endif /* MBEDTLS_USER_CONFIG_FILE */
#if defined(MBEDTLS_PSA_CRYPTO_CONFIG_FILE)
if( strcmp( "MBEDTLS_PSA_CRYPTO_CONFIG_FILE", config ) == 0 )
{
MACRO_EXPANSION_TO_STR( MBEDTLS_PSA_CRYPTO_CONFIG_FILE );
return( 0 );
}
#endif /* MBEDTLS_PSA_CRYPTO_CONFIG_FILE */
#if defined(MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE)
if( strcmp( "MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE", config ) == 0 )
{
MACRO_EXPANSION_TO_STR( MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE );
return( 0 );
}
#endif /* MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE */
#if defined(MBEDTLS_MPI_WINDOW_SIZE)
if( strcmp( "MBEDTLS_MPI_WINDOW_SIZE", config ) == 0 )
{
@@ -3946,6 +3978,22 @@ void list_config( void )
OUTPUT_MACRO_NAME_VALUE(MBEDTLS_XTEA_C);
#endif /* MBEDTLS_XTEA_C */
#if defined(MBEDTLS_CONFIG_FILE)
OUTPUT_MACRO_NAME_VALUE(MBEDTLS_CONFIG_FILE);
#endif /* MBEDTLS_CONFIG_FILE */
#if defined(MBEDTLS_USER_CONFIG_FILE)
OUTPUT_MACRO_NAME_VALUE(MBEDTLS_USER_CONFIG_FILE);
#endif /* MBEDTLS_USER_CONFIG_FILE */
#if defined(MBEDTLS_PSA_CRYPTO_CONFIG_FILE)
OUTPUT_MACRO_NAME_VALUE(MBEDTLS_PSA_CRYPTO_CONFIG_FILE);
#endif /* MBEDTLS_PSA_CRYPTO_CONFIG_FILE */
#if defined(MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE)
OUTPUT_MACRO_NAME_VALUE(MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE);
#endif /* MBEDTLS_PSA_CRYPTO_USER_CONFIG_FILE */
#if defined(MBEDTLS_MPI_WINDOW_SIZE)
OUTPUT_MACRO_NAME_VALUE(MBEDTLS_MPI_WINDOW_SIZE);
#endif /* MBEDTLS_MPI_WINDOW_SIZE */