eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert new field and check ciphersuite match when resume by exist info_id

Browse source 
Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>
This commit is contained in:
Xiaokang Qian 2023-01-12 03:18:31 +00:00
parent 4224244883
commit ea28a78384
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/mbedtls/ssl.h
View file

@ -1180,9 +1180,6 @@ struct mbedtls_ssl_session {
mbedtls_time_t MBEDTLS_PRIVATE(start); /*!< starting time */ mbedtls_time_t MBEDTLS_PRIVATE(start); /*!< starting time */
#endif #endif
int MBEDTLS_PRIVATE(ciphersuite); /*!< chosen ciphersuite */ int MBEDTLS_PRIVATE(ciphersuite); /*!< chosen ciphersuite */
#if defined(MBEDTLS_SSL_SESSION_TICKETS)
int MBEDTLS_PRIVATE(res_ciphersuite); /*!< resumption ciphersuite */
#endif
size_t MBEDTLS_PRIVATE(id_len); /*!< session id length */ size_t MBEDTLS_PRIVATE(id_len); /*!< session id length */
unsigned char MBEDTLS_PRIVATE(id)[32]; /*!< session identifier */ unsigned char MBEDTLS_PRIVATE(id)[32]; /*!< session identifier */
unsigned char MBEDTLS_PRIVATE(master)[48]; /*!< the master secret */ unsigned char MBEDTLS_PRIVATE(master)[48]; /*!< the master secret */

6
library/ssl_tls13_client.c
View file

@ -1106,8 +1106,7 @@ static int ssl_tls13_parse_server_pre_shared_key_ext(mbedtls_ssl_context *ssl,
} }
#if defined(MBEDTLS_SSL_SESSION_TICKETS) #if defined(MBEDTLS_SSL_SESSION_TICKETS)
if (ssl->handshake->resume && if (ssl->handshake->ciphersuite_info->id !=
ssl->session_negotiate->res_ciphersuite !=
ssl->session_negotiate->ciphersuite) { ssl->session_negotiate->ciphersuite) {
MBEDTLS_SSL_DEBUG_MSG( MBEDTLS_SSL_DEBUG_MSG(
1, ("Invalid ciphersuite for session ticket psk.")); 1, ("Invalid ciphersuite for session ticket psk."));
@ -1705,8 +1704,7 @@ static int ssl_tls13_parse_server_hello(mbedtls_ssl_context *ssl,
handshake->ciphersuite_info = ciphersuite_info; handshake->ciphersuite_info = ciphersuite_info;
#if defined(MBEDTLS_SSL_SESSION_TICKETS) #if defined(MBEDTLS_SSL_SESSION_TICKETS)
ssl->session_negotiate->res_ciphersuite = if (handshake->resume == 0)
ssl->session_negotiate->ciphersuite;
#endif #endif
ssl->session_negotiate->ciphersuite = cipher_suite; ssl->session_negotiate->ciphersuite = cipher_suite;