Merge pull request #8434 from valeriosetti/issue8407

[G2] Make TLS work without Cipher
This commit is contained in:
Gilles Peskine 2023-11-04 15:05:00 +00:00 committed by GitHub
commit 8b6b41f6cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 608 additions and 444 deletions

View file

@ -249,6 +249,33 @@ uint32_t mbedtls_ssl_get_extension_mask(unsigned int extension_type);
* counter (8) + header (5) + IV(16) + MAC (16-48) + padding (0-256).
*/
/* 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. */