ssl: replace MBEDTLS_SSL_HAVE_*_CBC with two seperate macros

MBEDTLS_SSL_HAVE_<block_cipher>_CBC equals
MBEDTLS_SSL_HAVE_<block_cipher> and MBEDTLS_SSL_HAVE_CBC.

Signed-off-by: Pengyu Lv <pengyu.lv@arm.com>
This commit is contained in:
Pengyu Lv 2023-11-08 14:21:19 +08:00
parent ba6825e37b
commit 2bd56de3f4
3 changed files with 420 additions and 447 deletions

View file

@ -269,33 +269,6 @@ uint32_t mbedtls_ssl_get_extension_mask(unsigned int extension_type);
#define MBEDTLS_SSL_HAVE_CBC
#endif
/* Some internal helpers to determine which keys are availble for CBC mode. */
#if defined(MBEDTLS_USE_PSA_CRYPTO)
#if defined(PSA_WANT_ALG_CBC_NO_PADDING)
#if defined(PSA_WANT_KEY_TYPE_AES)
#define MBEDTLS_SSL_HAVE_AES_CBC
#endif
#if defined(PSA_WANT_KEY_TYPE_ARIA)
#define MBEDTLS_SSL_HAVE_ARIA_CBC
#endif
#if defined(PSA_WANT_KEY_TYPE_CAMELLIA)
#define MBEDTLS_SSL_HAVE_CAMELLIA_CBC
#endif
#endif /* PSA_WANT_ALG_CBC_NO_PADDING */
#else /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(MBEDTLS_CIPHER_MODE_CBC)
#if defined(MEDTLS_AES_C)
#define MBEDTLS_SSL_HAVE_AES_CBC
#endif
#if defined(MEDTLS_ARIA_C)
#define MBEDTLS_SSL_HAVE_ARIA_CBC
#endif
#if defined(MEDTLS_CAMELLIA_C)
#define MBEDTLS_SSL_HAVE_CAMELLIA_CBC
#endif
#endif /* MBEDTLS_CIPHER_MODE_CBC */
#endif /* MBEDTLS_USE_PSA_CRYPTO*/
#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
/* This macro determines whether CBC is supported. */