lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-28 00:21:48 +03:00
Code Activity

Merge pull request #8495 from lpy4105/issue/6322/driver-only-cipher_aead-tls

Browse Source 
[G3] Driver-only cipher+aead: TLS: main test suite
This commit is contained in:
Manuel Pégourié-Gonnard
2023-11-09 11:10:34 +00:00
committed by GitHub
parent 4dec9ebdc2 2bd56de3f4
commit 7d7ce0e66a
9 changed files with 776 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
library/ssl_misc.h
View File

@ -249,40 +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
/* Some internal helpers to determine which keys are availble. */
#if (!defined(MBEDTLS_USE_PSA_CRYPTO) && defined(MBEDTLS_AES_C)) || \
(defined(MBEDTLS_USE_PSA_CRYPTO) && defined(PSA_WANT_KEY_TYPE_AES))
#define MBEDTLS_SSL_HAVE_AES
#endif
#if defined(PSA_WANT_KEY_TYPE_ARIA)
#define MBEDTLS_SSL_HAVE_ARIA_CBC
#if (!defined(MBEDTLS_USE_PSA_CRYPTO) && defined(MBEDTLS_CAMELLIA_C)) || \
(defined(MBEDTLS_USE_PSA_CRYPTO) && defined(PSA_WANT_KEY_TYPE_CAMELLIA))
#define MBEDTLS_SSL_HAVE_CAMELLIA
#endif
#if defined(PSA_WANT_KEY_TYPE_CAMELLIA)
#define MBEDTLS_SSL_HAVE_CAMELLIA_CBC
#if (!defined(MBEDTLS_USE_PSA_CRYPTO) && defined(MBEDTLS_ARIA_C)) || \
(defined(MBEDTLS_USE_PSA_CRYPTO) && defined(PSA_WANT_KEY_TYPE_ARIA))
#define MBEDTLS_SSL_HAVE_ARIA
#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
/* Some internal helpers to determine which operation modes are availble. */
#if (!defined(MBEDTLS_USE_PSA_CRYPTO) && defined(MBEDTLS_CIPHER_MODE_CBC)) || \
(defined(MBEDTLS_USE_PSA_CRYPTO) && defined(PSA_WANT_ALG_CBC_NO_PADDING))
#define MBEDTLS_SSL_HAVE_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. */
#if defined(MBEDTLS_CIPHER_MODE_CBC) && \
(defined(MBEDTLS_AES_C) || \
defined(MBEDTLS_CAMELLIA_C) || \
defined(MBEDTLS_ARIA_C) || \
#if defined(MBEDTLS_SSL_HAVE_CBC) && \
(defined(MBEDTLS_SSL_HAVE_AES) || \
defined(MBEDTLS_SSL_HAVE_CAMELLIA) || \
defined(MBEDTLS_SSL_HAVE_ARIA) || \
defined(MBEDTLS_DES_C))
#define MBEDTLS_SSL_SOME_SUITES_USE_CBC
#endif
@ -326,7 +319,7 @@ uint32_t mbedtls_ssl_get_extension_mask(unsigned int extension_type);
#define MBEDTLS_SSL_MAC_ADD 16
#endif
#if defined(MBEDTLS_CIPHER_MODE_CBC)
#if defined(MBEDTLS_SSL_HAVE_CBC)
#define MBEDTLS_SSL_PADDING_ADD 256
#else
#define MBEDTLS_SSL_PADDING_ADD 0