lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-01 10:06:53 +03:00
Code Activity

Fix MBEDTLS_SSL_TICKET_C, MBEDTLS_SSL_SESSION_TICKETS dependencies

Browse Source 
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemek Stekiel
2022-10-10 14:08:51 +02:00
parent 1834a2e985
commit 97d5740b7a
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/mbedtls/check_config.h
View File

@ -812,6 +812,11 @@
#error "MBEDTLS_SSL_TICKET_C defined, but not all prerequisites" #error "MBEDTLS_SSL_TICKET_C defined, but not all prerequisites"
#endif #endif
#if defined(MBEDTLS_SSL_TICKET_C) && \
!( defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CCM_C) || defined(MBEDTLS_CHACHAPOLY_C) )
#error "MBEDTLS_SSL_TICKET_C defined, but not all prerequisites"
#endif
#if defined(MBEDTLS_SSL_CBC_RECORD_SPLITTING) && \ #if defined(MBEDTLS_SSL_CBC_RECORD_SPLITTING) && \
!defined(MBEDTLS_SSL_PROTO_SSL3) && !defined(MBEDTLS_SSL_PROTO_TLS1) !defined(MBEDTLS_SSL_PROTO_SSL3) && !defined(MBEDTLS_SSL_PROTO_TLS1)
#error "MBEDTLS_SSL_CBC_RECORD_SPLITTING defined, but not all prerequisites" #error "MBEDTLS_SSL_CBC_RECORD_SPLITTING defined, but not all prerequisites"
@ -926,11 +931,6 @@
#error "MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH defined, but not all prerequisites" #error "MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH defined, but not all prerequisites"
#endif #endif
#if defined(MBEDTLS_SSL_SESSION_TICKETS) && \
!( defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CCM_C) || defined(MBEDTLS_CHACHAPOLY_C) )
#error "MBEDTLS_SSL_SESSION_TICKETS defined, but not all prerequisites"
#endif
#if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION) && !( defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CCM_C) || defined(MBEDTLS_CHACHAPOLY_C) ) #if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION) && !( defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CCM_C) || defined(MBEDTLS_CHACHAPOLY_C) )
#error "MBEDTLS_SSL_CONTEXT_SERIALIZATION defined, but not all prerequisites" #error "MBEDTLS_SSL_CONTEXT_SERIALIZATION defined, but not all prerequisites"
#endif #endif

5
include/mbedtls/config.h
View File

@ -1992,8 +1992,6 @@
* tickets, including authenticated encryption and key management. Example * tickets, including authenticated encryption and key management. Example
* callbacks are provided by MBEDTLS_SSL_TICKET_C. * callbacks are provided by MBEDTLS_SSL_TICKET_C.
* *
* Requires: MBEDTLS_GCM_C or MBEDTLS_CCM_C or MBEDTLS_CHACHAPOLY_C
*
* Comment this macro to disable support for SSL session tickets * Comment this macro to disable support for SSL session tickets
*/ */
#define MBEDTLS_SSL_SESSION_TICKETS #define MBEDTLS_SSL_SESSION_TICKETS
@ -3404,7 +3402,8 @@
* Module: library/ssl_ticket.c * Module: library/ssl_ticket.c
* Caller: * Caller:
* *
* Requires: MBEDTLS_CIPHER_C * Requires: MBEDTLS_CIPHER_C &&
* ( MBEDTLS_GCM_C || MBEDTLS_CCM_C || MBEDTLS_CHACHAPOLY_C )
*/ */
#define MBEDTLS_SSL_TICKET_C #define MBEDTLS_SSL_TICKET_C

12
tests/scripts/all.sh
View File

@ -1283,7 +1283,7 @@ component_test_tls1_2_default_stream_cipher_only () {
scripts/config.py set MBEDTLS_CIPHER_NULL_CIPHER scripts/config.py set MBEDTLS_CIPHER_NULL_CIPHER
# Modules that depend on AEAD # Modules that depend on AEAD
scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS scripts/config.py unset MBEDTLS_SSL_TICKET_C
# Enable Key Wrapping mode for 128-bit block ciphers # Enable Key Wrapping mode for 128-bit block ciphers
scripts/config.py set MBEDTLS_NIST_KW_C scripts/config.py set MBEDTLS_NIST_KW_C
@ -1311,7 +1311,7 @@ component_test_tls1_2_default_stream_cipher_only_use_psa () {
scripts/config.py set MBEDTLS_CIPHER_NULL_CIPHER scripts/config.py set MBEDTLS_CIPHER_NULL_CIPHER
# Modules that depend on AEAD # Modules that depend on AEAD
scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS scripts/config.py unset MBEDTLS_SSL_TICKET_C
# Enable Key Wrapping mode for 128-bit block ciphers # Enable Key Wrapping mode for 128-bit block ciphers
scripts/config.py set MBEDTLS_NIST_KW_C scripts/config.py set MBEDTLS_NIST_KW_C
@ -1338,7 +1338,7 @@ component_test_tls1_2_default_cbc_legacy_cipher_only () {
scripts/config.py unset MBEDTLS_CIPHER_NULL_CIPHER scripts/config.py unset MBEDTLS_CIPHER_NULL_CIPHER
# Modules that depend on AEAD # Modules that depend on AEAD
scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS scripts/config.py unset MBEDTLS_SSL_TICKET_C
# Enable Key Wrapping mode for 128-bit block ciphers # Enable Key Wrapping mode for 128-bit block ciphers
scripts/config.py set MBEDTLS_NIST_KW_C scripts/config.py set MBEDTLS_NIST_KW_C
@ -1367,7 +1367,7 @@ component_test_tls1_2_deafult_cbc_legacy_cipher_only_use_psa () {
scripts/config.py unset MBEDTLS_CIPHER_NULL_CIPHER scripts/config.py unset MBEDTLS_CIPHER_NULL_CIPHER
# Modules that depend on AEAD # Modules that depend on AEAD
scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS scripts/config.py unset MBEDTLS_SSL_TICKET_C
# Enable Key Wrapping mode for 128-bit block ciphers # Enable Key Wrapping mode for 128-bit block ciphers
scripts/config.py set MBEDTLS_NIST_KW_C scripts/config.py set MBEDTLS_NIST_KW_C
@ -1395,7 +1395,7 @@ component_test_tls1_2_default_cbc_legacy_cbc_etm_cipher_only () {
scripts/config.py unset MBEDTLS_CIPHER_NULL_CIPHER scripts/config.py unset MBEDTLS_CIPHER_NULL_CIPHER
# Modules that depend on AEAD # Modules that depend on AEAD
scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS scripts/config.py unset MBEDTLS_SSL_TICKET_C
# Enable Key Wrapping mode for 128-bit block ciphers # Enable Key Wrapping mode for 128-bit block ciphers
scripts/config.py set MBEDTLS_NIST_KW_C scripts/config.py set MBEDTLS_NIST_KW_C
@ -1424,7 +1424,7 @@ component_test_tls1_2_default_cbc_legacy_cbc_etm_cipher_only_use_psa () {
scripts/config.py unset MBEDTLS_CIPHER_NULL_CIPHER scripts/config.py unset MBEDTLS_CIPHER_NULL_CIPHER
# Modules that depend on AEAD # Modules that depend on AEAD
scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION scripts/config.py unset MBEDTLS_SSL_CONTEXT_SERIALIZATION
scripts/config.py unset MBEDTLS_SSL_SESSION_TICKETS scripts/config.py unset MBEDTLS_SSL_TICKET_C
# Enable Key Wrapping mode for 128-bit block ciphers # Enable Key Wrapping mode for 128-bit block ciphers
scripts/config.py set MBEDTLS_NIST_KW_C scripts/config.py set MBEDTLS_NIST_KW_C