mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-24 15:40:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix various issues

Browse Source 
- get ticket_flags with function.
- improve output message and check it.
- improve `ssl_server2` help message

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2023-11-21 17:06:36 +08:00
parent 3db60dfe5e
commit ea96ac3da9
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/ssl_tls13_server.c
View File

@ -1850,7 +1850,8 @@ static void ssl_tls13_update_early_data_status(mbedtls_ssl_context *ssl)
MBEDTLS_SSL_TLS1_3_TICKET_ALLOW_EARLY_DATA) == 0) { MBEDTLS_SSL_TLS1_3_TICKET_ALLOW_EARLY_DATA) == 0) {
MBEDTLS_SSL_DEBUG_MSG( MBEDTLS_SSL_DEBUG_MSG(
1, 1,
("EarlyData: rejected, denied by ticket permission bits.")); ("EarlyData: rejected, early_data not allowed in ticket "
"permission bits."));
return; return;
} }
@ -3222,10 +3223,11 @@ static int ssl_tls13_write_nst_early_data_ext(mbedtls_ssl_context *ssl,
unsigned char *p = buf; unsigned char *p = buf;
*out_len = 0; *out_len = 0;
if ((ssl->session->ticket_flags & if (mbedtls_ssl_session_get_ticket_flags(
MBEDTLS_SSL_TLS1_3_TICKET_ALLOW_EARLY_DATA) == 0) { ssl->session, MBEDTLS_SSL_TLS1_3_TICKET_ALLOW_EARLY_DATA) == 0) {
MBEDTLS_SSL_DEBUG_MSG( MBEDTLS_SSL_DEBUG_MSG(
4, ("Skip early_data extension in NST for it is not allowed.")); 4, ("early_data not allowed, skip early_data extension in "
"NewSessionTicket"));
return 0; return 0;
} }

4
programs/ssl/ssl_server2.c
View File

@ -435,7 +435,9 @@ int main(void)
" The max amount of 0-RTT data for 1st and 2nd connection\n" \ " The max amount of 0-RTT data for 1st and 2nd connection\n" \
" format: 1st_connection_value[,2nd_connection_value]\n" \ " format: 1st_connection_value[,2nd_connection_value]\n" \
" available values: < 0 (disabled), >= 0 (enabled).\n" \ " available values: < 0 (disabled), >= 0 (enabled).\n" \
" The absolute value is the max amount of 0-RTT data.\n" " The absolute value is the max amount of 0-RTT data \n" \
" up to UINT32_MAX. \n"
#else #else
#define USAGE_EARLY_DATA "" #define USAGE_EARLY_DATA ""
#endif /* MBEDTLS_SSL_EARLY_DATA */ #endif /* MBEDTLS_SSL_EARLY_DATA */

2
tests/opt-testcases/tls13-misc.sh
View File

@ -523,5 +523,3 @@ run_test "TLS 1.3 G->m: EarlyData: feature is enabled, good." \
-s "ClientHello: early_data(42) extension exists." \ -s "ClientHello: early_data(42) extension exists." \
-s "EncryptedExtensions: early_data(42) extension exists." \ -s "EncryptedExtensions: early_data(42) extension exists." \
-s "$( tail -1 $EARLY_DATA_INPUT )" -s "$( tail -1 $EARLY_DATA_INPUT )"