mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-29 03:32:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add code improvments and refactoring in dealing with ALPN

Browse Source 
Signed-off-by: Waleed Elmelegy <waleed.elmelegy@arm.com>
This commit is contained in:
Waleed Elmelegy 2024-03-12 16:25:08 +00:00
parent 7dfba34475
commit 5bc5263b2c
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/mbedtls/ssl.h
View File

@ -1305,7 +1305,8 @@ struct mbedtls_ssl_session {
#endif /* MBEDTLS_SSL_SERVER_NAME_INDICATION && MBEDTLS_SSL_CLI_C */ #endif /* MBEDTLS_SSL_SERVER_NAME_INDICATION && MBEDTLS_SSL_CLI_C */
#if defined(MBEDTLS_SSL_EARLY_DATA) && defined(MBEDTLS_SSL_ALPN) && defined(MBEDTLS_SSL_SRV_C) #if defined(MBEDTLS_SSL_EARLY_DATA) && defined(MBEDTLS_SSL_ALPN) && defined(MBEDTLS_SSL_SRV_C)
char *ticket_alpn; /*!< ALPN negotiated in the session */ char *ticket_alpn; /*!< ALPN negotiated in the session
during which the ticket was generated. */
#endif #endif
#if defined(MBEDTLS_HAVE_TIME) && defined(MBEDTLS_SSL_CLI_C) #if defined(MBEDTLS_HAVE_TIME) && defined(MBEDTLS_SSL_CLI_C)

4
library/ssl_misc.h
View File

@ -2855,8 +2855,8 @@ int mbedtls_ssl_session_set_hostname(mbedtls_ssl_session *session,
#if defined(MBEDTLS_SSL_SRV_C) && defined(MBEDTLS_SSL_EARLY_DATA) && \ #if defined(MBEDTLS_SSL_SRV_C) && defined(MBEDTLS_SSL_EARLY_DATA) && \
defined(MBEDTLS_SSL_ALPN) defined(MBEDTLS_SSL_ALPN)
MBEDTLS_CHECK_RETURN_CRITICAL MBEDTLS_CHECK_RETURN_CRITICAL
int mbedtls_ssl_session_set_alpn(mbedtls_ssl_session *session, int mbedtls_ssl_session_set_ticket_alpn(mbedtls_ssl_session *session,
const char *alpn); const char *alpn);
#endif #endif
#if defined(MBEDTLS_SSL_PROTO_TLS1_3) && defined(MBEDTLS_SSL_SESSION_TICKETS) #if defined(MBEDTLS_SSL_PROTO_TLS1_3) && defined(MBEDTLS_SSL_SESSION_TICKETS)

11
library/ssl_tls13_server.c
View File

@ -469,8 +469,7 @@ static int ssl_tls13_session_copy_ticket(mbedtls_ssl_session *dst,
dst->max_early_data_size = src->max_early_data_size; dst->max_early_data_size = src->max_early_data_size;
#if defined(MBEDTLS_SSL_ALPN) #if defined(MBEDTLS_SSL_ALPN)
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = mbedtls_ssl_session_set_ticket_alpn(dst, src->ticket_alpn);
ret = mbedtls_ssl_session_set_alpn(dst, src->ticket_alpn);
if (ret != 0) { if (ret != 0) {
return ret; return ret;
} }
@ -3146,9 +3145,11 @@ static int ssl_tls13_prepare_new_session_ticket(mbedtls_ssl_context *ssl,
MBEDTLS_SSL_PRINT_TICKET_FLAGS(4, session->ticket_flags); MBEDTLS_SSL_PRINT_TICKET_FLAGS(4, session->ticket_flags);
#if defined(MBEDTLS_SSL_EARLY_DATA) && defined(MBEDTLS_SSL_ALPN) #if defined(MBEDTLS_SSL_EARLY_DATA) && defined(MBEDTLS_SSL_ALPN)
ret = mbedtls_ssl_session_set_alpn(session, ssl->alpn_chosen); if (session->ticket_alpn == NULL) {
if (ret != 0) { ret = mbedtls_ssl_session_set_ticket_alpn(session, ssl->alpn_chosen);
return ret; if (ret != 0) {
return ret;
}
} }
#endif #endif

3
tests/src/test_helpers/ssl_helpers.c
View File

@ -1794,8 +1794,7 @@ int mbedtls_test_ssl_tls13_populate_session(mbedtls_ssl_session *session,
#if defined(MBEDTLS_SSL_EARLY_DATA) #if defined(MBEDTLS_SSL_EARLY_DATA)
session->max_early_data_size = 0x87654321; session->max_early_data_size = 0x87654321;
#if defined(MBEDTLS_SSL_ALPN) && defined(MBEDTLS_SSL_SRV_C) #if defined(MBEDTLS_SSL_ALPN) && defined(MBEDTLS_SSL_SRV_C)
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = mbedtls_ssl_session_set_ticket_alpn(session, "ALPNExample");
ret = mbedtls_ssl_session_set_alpn(session, "ALPNExample");
if (ret != 0) { if (ret != 0) {
return -1; return -1;
} }