eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

check_config: make error message in BLOCK_CIPHER_NO_DECRYPT clearer

Browse source 
Signed-off-by: Yanray Wang <yanray.wang@arm.com>
This commit is contained in:
Yanray Wang 2023-11-08 19:12:23 +08:00
parent 004a60c087
commit d137da5a93
1 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

41
include/mbedtls/check_config.h
View file

@ -183,23 +183,34 @@
#error "MBEDTLS_NIST_KW_C defined, but not all prerequisites" #error "MBEDTLS_NIST_KW_C defined, but not all prerequisites"
#endif #endif
#if defined(MBEDTLS_BLOCK_CIPHER_NO_DECRYPT) && \ #if defined(MBEDTLS_BLOCK_CIPHER_NO_DECRYPT) && defined(MBEDTLS_PSA_CRYPTO_CONFIG)
(defined(MBEDTLS_CIPHER_MODE_CBC) || \ #if defined(PSA_WANT_ALG_CBC_NO_PADDING)
defined(MBEDTLS_CIPHER_MODE_XTS) || \ #error "MBEDTLS_BLOCK_CIPHER_NO_DECRYPT and PSA_WANT_ALG_CBC_NO_PADDING cannot be defined simultaneously"
defined(MBEDTLS_DES_C) || \ #endif
defined(MBEDTLS_NIST_KW_C)) #if defined(PSA_WANT_ALG_CBC_PKCS7)
#error "MBEDTLS_BLOCK_CIPHER_NO_DECRYPT and MBEDTLS_CIPHER_MODE_CBC/MBEDTLS_CIPHER_MODE_XTS/MBEDTLS_DES_C/MBEDTLS_NIST_KW_C \ #error "MBEDTLS_BLOCK_CIPHER_NO_DECRYPT and PSA_WANT_ALG_CBC_PKCS7 cannot be defined simultaneously"
cannot be defined simultaneously" #endif
#if defined(PSA_WANT_ALG_ECB_NO_PADDING)
#error "MBEDTLS_BLOCK_CIPHER_NO_DECRYPT and PSA_WANT_ALG_ECB_NO_PADDING cannot be defined simultaneously"
#endif
#if defined(PSA_WANT_KEY_TYPE_DES)
#error "MBEDTLS_BLOCK_CIPHER_NO_DECRYPT and PSA_WANT_KEY_TYPE_DES cannot be defined simultaneously"
#endif
#endif #endif
#if defined(MBEDTLS_BLOCK_CIPHER_NO_DECRYPT) && \ #if defined(MBEDTLS_BLOCK_CIPHER_NO_DECRYPT)
defined(MBEDTLS_PSA_CRYPTO_CONFIG) && \ #if defined(MBEDTLS_CIPHER_MODE_CBC)
(defined(PSA_WANT_ALG_CBC_NO_PADDING) || \ #error "MBEDTLS_BLOCK_CIPHER_NO_DECRYPT and MBEDTLS_CIPHER_MODE_CBC cannot be defined simultaneously"
defined(PSA_WANT_ALG_CBC_PKCS7) || \ #endif
defined(PSA_WANT_ALG_ECB_NO_PADDING) || \ #if defined(MBEDTLS_CIPHER_MODE_XTS)
defined(PSA_WANT_KEY_TYPE_DES)) #error "MBEDTLS_BLOCK_CIPHER_NO_DECRYPT and MBEDTLS_CIPHER_MODE_XTS cannot be defined simultaneously"
#error "MBEDTLS_BLOCK_CIPHER_NO_DECRYPT, MBEDTLS_PSA_CRYPTO_CONFIG and \ #endif
PSA_WANT_ALG_CBC_NO_PADDING/PSA_WANT_ALG_CBC_PKCS7/PSA_WANT_ALG_ECB_NO_PADDING/PSA_WANT_KEY_TYPE_DES cannot be defined simultaneously" #if defined(MBEDTLS_DES_C)
#error "MBEDTLS_BLOCK_CIPHER_NO_DECRYPT and MBEDTLS_DES_C cannot be defined simultaneously"
#endif
#if defined(MBEDTLS_NIST_KW_C)
#error "MBEDTLS_BLOCK_CIPHER_NO_DECRYPT and MBEDTLS_NIST_KW_C cannot be defined simultaneously"
#endif
#endif #endif
#if defined(MBEDTLS_ECDH_C) && !defined(MBEDTLS_ECP_C) #if defined(MBEDTLS_ECDH_C) && !defined(MBEDTLS_ECP_C)