mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-01-30 15:32:58 +00:00
Fix naming inconsistencies in config bits
Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
parent
531aca2810
commit
f686f1dc17
@ -4007,9 +4007,9 @@ static int ssl_tls13_session_load(const mbedtls_ssl_session *session,
|
|||||||
#endif /* MBEDTLS_X509_CRT_PARSE_C */
|
#endif /* MBEDTLS_X509_CRT_PARSE_C */
|
||||||
|
|
||||||
#if defined(MBEDTLS_SSL_KEEP_PEER_CERTIFICATE)
|
#if defined(MBEDTLS_SSL_KEEP_PEER_CERTIFICATE)
|
||||||
#define SSL_SERIALIZED_SESSION_KEEP_PEER_CRT 1
|
#define SSL_SERIALIZED_SESSION_CONFIG_KEEP_PEER_CRT 1
|
||||||
#else
|
#else
|
||||||
#define SSL_SERIALIZED_SESSION_KEEP_PEER_CRT 0
|
#define SSL_SERIALIZED_SESSION_CONFIG_KEEP_PEER_CRT 0
|
||||||
#endif /* MBEDTLS_SSL_SESSION_TICKETS */
|
#endif /* MBEDTLS_SSL_SESSION_TICKETS */
|
||||||
|
|
||||||
#if defined(MBEDTLS_SSL_CLI_C) && defined(MBEDTLS_SSL_SESSION_TICKETS)
|
#if defined(MBEDTLS_SSL_CLI_C) && defined(MBEDTLS_SSL_SESSION_TICKETS)
|
||||||
@ -4060,7 +4060,7 @@ static int ssl_tls13_session_load(const mbedtls_ssl_session *session,
|
|||||||
#define SSL_SERIALIZED_SESSION_CONFIG_MFL_BIT 3
|
#define SSL_SERIALIZED_SESSION_CONFIG_MFL_BIT 3
|
||||||
#define SSL_SERIALIZED_SESSION_CONFIG_ETM_BIT 4
|
#define SSL_SERIALIZED_SESSION_CONFIG_ETM_BIT 4
|
||||||
#define SSL_SERIALIZED_SESSION_CONFIG_TICKET_BIT 5
|
#define SSL_SERIALIZED_SESSION_CONFIG_TICKET_BIT 5
|
||||||
#define SSL_SERIALIZED_SESSION_CONFIG_KEEP_CRT_BIT 6
|
#define SSL_SERIALIZED_SESSION_CONFIG_KEEP_PEER_CRT_BIT 6
|
||||||
#define SSL_SERIALIZED_SESSION_CONFIG_SNI_BIT 7
|
#define SSL_SERIALIZED_SESSION_CONFIG_SNI_BIT 7
|
||||||
#define SSL_SERIALIZED_SESSION_CONFIG_EARLY_DATA_BIT 8
|
#define SSL_SERIALIZED_SESSION_CONFIG_EARLY_DATA_BIT 8
|
||||||
#define SSL_SERIALIZED_SESSION_CONFIG_RECORD_SIZE_BIT 9
|
#define SSL_SERIALIZED_SESSION_CONFIG_RECORD_SIZE_BIT 9
|
||||||
@ -4074,7 +4074,7 @@ static int ssl_tls13_session_load(const mbedtls_ssl_session *session,
|
|||||||
(SSL_SERIALIZED_SESSION_CONFIG_MFL << SSL_SERIALIZED_SESSION_CONFIG_MFL_BIT) | \
|
(SSL_SERIALIZED_SESSION_CONFIG_MFL << SSL_SERIALIZED_SESSION_CONFIG_MFL_BIT) | \
|
||||||
(SSL_SERIALIZED_SESSION_CONFIG_ETM << SSL_SERIALIZED_SESSION_CONFIG_ETM_BIT) | \
|
(SSL_SERIALIZED_SESSION_CONFIG_ETM << SSL_SERIALIZED_SESSION_CONFIG_ETM_BIT) | \
|
||||||
(SSL_SERIALIZED_SESSION_CONFIG_TICKET << SSL_SERIALIZED_SESSION_CONFIG_TICKET_BIT) | \
|
(SSL_SERIALIZED_SESSION_CONFIG_TICKET << SSL_SERIALIZED_SESSION_CONFIG_TICKET_BIT) | \
|
||||||
(SSL_SERIALIZED_SESSION_KEEP_PEER_CRT << SSL_SERIALIZED_SESSION_CONFIG_KEEP_CRT_BIT) | \
|
(SSL_SERIALIZED_SESSION_CONFIG_KEEP_PEER_CRT << SSL_SERIALIZED_SESSION_CONFIG_KEEP_PEER_CRT_BIT) | \
|
||||||
(SSL_SERIALIZED_SESSION_CONFIG_SNI << SSL_SERIALIZED_SESSION_CONFIG_SNI_BIT) | \
|
(SSL_SERIALIZED_SESSION_CONFIG_SNI << SSL_SERIALIZED_SESSION_CONFIG_SNI_BIT) | \
|
||||||
(SSL_SERIALIZED_SESSION_CONFIG_EARLY_DATA << \
|
(SSL_SERIALIZED_SESSION_CONFIG_EARLY_DATA << \
|
||||||
SSL_SERIALIZED_SESSION_CONFIG_EARLY_DATA_BIT) | \
|
SSL_SERIALIZED_SESSION_CONFIG_EARLY_DATA_BIT) | \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user