mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-02-19 09:40:29 +00:00
Update ssl session serialization config bitflag
Add config bits for server name indication, early data and record size limit, which all cause the serialized session to be structured differently. Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
parent
5c5a32f52a
commit
92b258bb50
@ -3692,6 +3692,24 @@ int mbedtls_ssl_get_session(const mbedtls_ssl_context *ssl,
|
||||
#define SSL_SERIALIZED_SESSION_CONFIG_TICKET 0
|
||||
#endif /* MBEDTLS_SSL_SESSION_TICKETS */
|
||||
|
||||
#if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION)
|
||||
#define SSL_SERIALIZED_SESSION_CONFIG_SNI 1
|
||||
#else
|
||||
#define SSL_SERIALIZED_SESSION_CONFIG_SNI 0
|
||||
#endif /* MBEDTLS_SSL_SERVER_NAME_INDICATION */
|
||||
|
||||
#if defined(MBEDTLS_SSL_EARLY_DATA)
|
||||
#define SSL_SERIALIZED_SESSION_CONFIG_EARLY_DATA 1
|
||||
#else
|
||||
#define SSL_SERIALIZED_SESSION_CONFIG_EARLY_DATA 0
|
||||
#endif /* MBEDTLS_SSL_EARLY_DATA */
|
||||
|
||||
#if defined(MBEDTLS_SSL_RECORD_SIZE_LIMIT)
|
||||
#define SSL_SERIALIZED_SESSION_CONFIG_RECORD_SIZE 1
|
||||
#else
|
||||
#define SSL_SERIALIZED_SESSION_CONFIG_RECORD_SIZE 0
|
||||
#endif /* MBEDTLS_SSL_RECORD_SIZE_LIMIT */
|
||||
|
||||
#define SSL_SERIALIZED_SESSION_CONFIG_TIME_BIT 0
|
||||
#define SSL_SERIALIZED_SESSION_CONFIG_CRT_BIT 1
|
||||
#define SSL_SERIALIZED_SESSION_CONFIG_CLIENT_TICKET_BIT 2
|
||||
@ -3699,6 +3717,9 @@ int mbedtls_ssl_get_session(const mbedtls_ssl_context *ssl,
|
||||
#define SSL_SERIALIZED_SESSION_CONFIG_ETM_BIT 4
|
||||
#define SSL_SERIALIZED_SESSION_CONFIG_TICKET_BIT 5
|
||||
#define SSL_SERIALIZED_SESSION_CONFIG_KEEP_CRT_BIT 6
|
||||
#define SSL_SERIALIZED_SESSION_CONFIG_SNI_BIT 7
|
||||
#define SSL_SERIALIZED_SESSION_CONFIG_EARLY_DATA_BIT 8
|
||||
#define SSL_SERIALIZED_SESSION_CONFIG_RECORD_SIZE_BIT 9
|
||||
|
||||
#define SSL_SERIALIZED_SESSION_CONFIG_BITFLAG \
|
||||
((uint16_t) ( \
|
||||
@ -3709,7 +3730,12 @@ int mbedtls_ssl_get_session(const mbedtls_ssl_context *ssl,
|
||||
(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_TICKET << SSL_SERIALIZED_SESSION_CONFIG_TICKET_BIT) | \
|
||||
(SSL_SERIALIZED_SESSION_KEEP_PEER_CRT << SSL_SERIALIZED_SESSION_CONFIG_KEEP_CRT_BIT)))
|
||||
(SSL_SERIALIZED_SESSION_KEEP_PEER_CRT << SSL_SERIALIZED_SESSION_CONFIG_KEEP_CRT_BIT) | \
|
||||
(SSL_SERIALIZED_SESSION_CONFIG_SNI << SSL_SERIALIZED_SESSION_CONFIG_SNI_BIT) | \
|
||||
(SSL_SERIALIZED_SESSION_CONFIG_EARLY_DATA << \
|
||||
SSL_SERIALIZED_SESSION_CONFIG_EARLY_DATA_BIT) | \
|
||||
(SSL_SERIALIZED_SESSION_CONFIG_RECORD_SIZE << \
|
||||
SSL_SERIALIZED_SESSION_CONFIG_RECORD_SIZE_BIT)))
|
||||
|
||||
static const unsigned char ssl_serialized_session_header[] = {
|
||||
MBEDTLS_VERSION_MAJOR,
|
||||
|
Loading…
x
Reference in New Issue
Block a user