lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

Rebase code to restore reco-delay and fix some style issues

Browse Source 
Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>
This commit is contained in:
Xiaokang Qian
2023-02-08 06:04:50 +00:00
parent 8dc4ce76c7
commit 0de0d863b6
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
library/ssl_tls13_client.c
View File

@ -1279,16 +1279,16 @@ int mbedtls_ssl_tls13_finalize_client_hello(mbedtls_ssl_context *ssl)
*/ */
ret = mbedtls_ssl_tls13_key_schedule_stage_early(ssl); ret = mbedtls_ssl_tls13_key_schedule_stage_early(ssl);
if (ret != 0) { if (ret != 0) {
MBEDTLS_SSL_DEBUG_RET(1, MBEDTLS_SSL_DEBUG_RET(
"mbedtls_ssl_tls13_key_schedule_stage_early", ret); 1, "mbedtls_ssl_tls13_key_schedule_stage_early", ret);
return ret; return ret;
} }
/* Derive early data key material */ /* Derive early data key material */
ret = mbedtls_ssl_tls13_compute_early_transform(ssl); ret = mbedtls_ssl_tls13_compute_early_transform(ssl);
if (ret != 0) { if (ret != 0) {
MBEDTLS_SSL_DEBUG_RET(1, MBEDTLS_SSL_DEBUG_RET(
"mbedtls_ssl_tls13_compute_early_transform", ret); 1, "mbedtls_ssl_tls13_compute_early_transform", ret);
return ret; return ret;
} }
@ -1938,7 +1938,8 @@ static int ssl_tls13_postprocess_server_hello(mbedtls_ssl_context *ssl)
} }
#endif #endif
if (!mbedtls_ssl_conf_tls13_check_kex_modes(ssl, handshake->key_exchange_mode)) { if (!mbedtls_ssl_conf_tls13_check_kex_modes(
ssl, handshake->key_exchange_mode)) {
ret = MBEDTLS_ERR_SSL_HANDSHAKE_FAILURE; ret = MBEDTLS_ERR_SSL_HANDSHAKE_FAILURE;
MBEDTLS_SSL_DEBUG_MSG(2, MBEDTLS_SSL_DEBUG_MSG(2,
("Key exchange mode(%s) is not supported.", ("Key exchange mode(%s) is not supported.",
@ -2255,7 +2256,8 @@ static int ssl_tls13_write_end_of_early_data(mbedtls_ssl_context *ssl)
MBEDTLS_SSL_DEBUG_MSG(2, ("=> write EndOfEarlyData")); MBEDTLS_SSL_DEBUG_MSG(2, ("=> write EndOfEarlyData"));
MBEDTLS_SSL_PROC_CHK(mbedtls_ssl_start_handshake_msg( MBEDTLS_SSL_PROC_CHK(mbedtls_ssl_start_handshake_msg(
ssl, MBEDTLS_SSL_HS_END_OF_EARLY_DATA, &buf, &buf_len)); ssl, MBEDTLS_SSL_HS_END_OF_EARLY_DATA,
&buf, &buf_len));
mbedtls_ssl_add_hs_hdr_to_checksum( mbedtls_ssl_add_hs_hdr_to_checksum(
ssl, MBEDTLS_SSL_HS_END_OF_EARLY_DATA, 0); ssl, MBEDTLS_SSL_HS_END_OF_EARLY_DATA, 0);

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

@ -274,7 +274,7 @@ requires_any_configs_enabled MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_
MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED
run_test "TLS 1.3 m->G: EarlyData: basic check, good" \ run_test "TLS 1.3 m->G: EarlyData: basic check, good" \
"$G_NEXT_SRV -d 10 --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+CIPHER-ALL:+ECDHE-PSK:+PSK --earlydata --disable-client-cert" \ "$G_NEXT_SRV -d 10 --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+CIPHER-ALL:+ECDHE-PSK:+PSK --earlydata --disable-client-cert" \
"$P_CLI debug_level=4 early_data=1 reco_mode=1 reconnect=1 reco_delay=2" \ "$P_CLI debug_level=4 early_data=1 reco_mode=1 reconnect=1 reco_delay=900" \
0 \ 0 \
-c "Reconnecting with saved session" \ -c "Reconnecting with saved session" \
-c "NewSessionTicket: early_data(42) extension received." \ -c "NewSessionTicket: early_data(42) extension received." \