fix review comments
Signed-off-by: Pengyu Lv <pengyu.lv@arm.com>
This commit is contained in:
parent
06cf66d2ab
commit
a1aa31b8b1
4 changed files with 8 additions and 2 deletions
|
@ -82,7 +82,9 @@
|
|||
#define MBEDTLS_SSL_DEBUG_ECP(level, text, X) do { } while (0)
|
||||
#define MBEDTLS_SSL_DEBUG_CRT(level, text, crt) do { } while (0)
|
||||
#define MBEDTLS_SSL_DEBUG_ECDH(level, ecdh, attr) do { } while (0)
|
||||
#if defined(MBEDTLS_SSL_PROTO_TLS1_3) && defined(MBEDTLS_SSL_SESSION_TICKETS)
|
||||
#define MBEDTLS_SSL_DEBUG_TICKET_FLAGS(level, flag) do { } while (0)
|
||||
#endif
|
||||
|
||||
#endif /* MBEDTLS_DEBUG_C */
|
||||
|
||||
|
|
|
@ -96,7 +96,7 @@
|
|||
/* Error space gap */
|
||||
/** Processing of the Certificate handshake message failed. */
|
||||
#define MBEDTLS_ERR_SSL_BAD_CERTIFICATE -0x7A00
|
||||
/** The kex mode allowed by ticket is not supported by client */
|
||||
/** No suitable key exchange mode for ticket */
|
||||
#define MBEDTLS_ERR_SSL_TICKET_INVALID_KEX_MODE -0x7A80
|
||||
/**
|
||||
* Received NewSessionTicket Post Handshake Message.
|
||||
|
|
|
@ -2738,6 +2738,6 @@ static inline void mbedtls_ssl_tls13_session_clear_ticket_flags(
|
|||
{
|
||||
session->ticket_flags &= ~(flags & MBEDTLS_SSL_TLS1_3_TICKET_FLAGS_MASK);
|
||||
}
|
||||
#endif
|
||||
#endif /* MBEDTLS_SSL_PROTO_TLS1_3 && MBEDTLS_SSL_SESSION_TICKETS */
|
||||
|
||||
#endif /* ssl_misc.h */
|
||||
|
|
|
@ -2567,6 +2567,10 @@ static int ssl_tls13_handshake_wrapup(mbedtls_ssl_context *ssl)
|
|||
mbedtls_ssl_tls13_handshake_wrapup(ssl);
|
||||
|
||||
#if defined(MBEDTLS_SSL_SESSION_TICKETS)
|
||||
/* TODO: Remove the check of SOME_PSK_ENABLED since SESSION_TICKETS requires
|
||||
* SOME_PSK_ENABLED to be enabled. Here is just to make CI happy. It is
|
||||
* expected to be resolved with issue#6395.
|
||||
*/
|
||||
#if defined(MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_SOME_PSK_ENABLED)
|
||||
/* Sent NewSessionTicket message only when client supports PSK */
|
||||
if (!mbedtls_ssl_tls13_some_psk_enabled(ssl)) {
|
||||
|
|
Loading…
Reference in a new issue