Skip to content

Commit 32467e1

Browse files
yuhaothyuhaoth
committed
Change time resolution of reco_delay from second to millionseconds
Per gnutls anti replay issue, it needs millionsecond time delay for improve the fail rate. From test result of Mbed-TLS#6712, this commit can improve the fail rate from 4% to 92%. Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
1 parent 0c57cd3 commit 32467e1

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

‎programs/ssl/ssl_client2.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ int main( void )
424424
" reconnect=%%d number of reconnections using session resumption\n" \
425425
" default: 0 (disabled)\n" \
426426
" reco_server_name=%%s default: NULL\n" \
427-
" reco_delay=%%d default: 0 seconds\n" \
427+
" reco_delay=%%d default: 0 millionseconds\n" \
428428
" reco_mode=%%d 0: copy session, 1: serialize session\n" \
429429
" default: 1\n" \
430430
" reconnect_hard=%%d default: 0 (disabled)\n" \
@@ -3184,7 +3184,7 @@ int main( int argc, char *argv[] )
31843184

31853185
#if defined(MBEDTLS_TIMING_C)
31863186
if( opt.reco_delay > 0 )
3187-
mbedtls_net_usleep( 1000000 * opt.reco_delay );
3187+
mbedtls_net_usleep( 1000 * opt.reco_delay );
31883188
#endif
31893189

31903190
mbedtls_printf( " . Reconnecting with saved session..." );

‎tests/opt-testcases/tls13-misc.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ requires_any_configs_enabled MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_
292292
MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED
293293
run_test "TLS 1.3 m->G: EarlyData: basic check, good" \
294294
"$G_NEXT_SRV -d 10 --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+CIPHER-ALL:+ECDHE-PSK:+PSK --earlydata --disable-client-cert" \
295-
"$P_CLI debug_level=4 early_data=1 reco_mode=1 reconnect=1 reco_delay=2" \
295+
"$P_CLI debug_level=4 early_data=1 reco_mode=1 reconnect=1 reco_delay=900" \
296296
1 \
297297
-c "Reconnecting with saved session" \
298298
-c "NewSessionTicket: early_data(42) extension received." \
@@ -313,7 +313,7 @@ requires_any_configs_enabled MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_
313313
MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED
314314
run_test "TLS 1.3 m->G: EarlyData: no early_data in NewSessionTicket, good" \
315315
"$G_NEXT_SRV -d 10 --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+CIPHER-ALL:+ECDHE-PSK:+PSK --disable-client-cert" \
316-
"$P_CLI debug_level=4 early_data=1 reco_mode=1 reconnect=1 reco_delay=2" \
316+
"$P_CLI debug_level=4 early_data=1 reco_mode=1 reconnect=1" \
317317
0 \
318318
-c "Reconnecting with saved session" \
319319
-C "NewSessionTicket: early_data(42) extension received." \

‎tests/ssl-opt.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -3624,7 +3624,7 @@ run_test "Session resume using tickets: cache disabled" \
36243624
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
36253625
run_test "Session resume using tickets: timeout" \
36263626
"$P_SRV debug_level=3 tickets=1 cache_max=0 ticket_timeout=1" \
3627-
"$P_CLI debug_level=3 tickets=1 reconnect=1 reco_delay=2" \
3627+
"$P_CLI debug_level=3 tickets=1 reconnect=1 reco_delay=2000" \
36283628
0 \
36293629
-c "client hello, adding session ticket extension" \
36303630
-s "found session ticket extension" \
@@ -3934,7 +3934,7 @@ run_test "Session resume using tickets, DTLS: cache disabled" \
39343934
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
39353935
run_test "Session resume using tickets, DTLS: timeout" \
39363936
"$P_SRV debug_level=3 dtls=1 tickets=1 cache_max=0 ticket_timeout=1" \
3937-
"$P_CLI debug_level=3 dtls=1 tickets=1 reconnect=1 skip_close_notify=1 reco_delay=2" \
3937+
"$P_CLI debug_level=3 dtls=1 tickets=1 reconnect=1 skip_close_notify=1 reco_delay=2000" \
39383938
0 \
39393939
-c "client hello, adding session ticket extension" \
39403940
-s "found session ticket extension" \
@@ -4058,7 +4058,7 @@ requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
40584058
requires_config_enabled MBEDTLS_SSL_CACHE_C
40594059
run_test "Session resume using cache: timeout < delay" \
40604060
"$P_SRV debug_level=3 tickets=0 cache_timeout=1" \
4061-
"$P_CLI debug_level=3 tickets=0 reconnect=1 reco_delay=2" \
4061+
"$P_CLI debug_level=3 tickets=0 reconnect=1 reco_delay=2000" \
40624062
0 \
40634063
-S "session successfully restored from cache" \
40644064
-S "session successfully restored from ticket" \
@@ -4069,7 +4069,7 @@ requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
40694069
requires_config_enabled MBEDTLS_SSL_CACHE_C
40704070
run_test "Session resume using cache: no timeout" \
40714071
"$P_SRV debug_level=3 tickets=0 cache_timeout=0" \
4072-
"$P_CLI debug_level=3 tickets=0 reconnect=1 reco_delay=2" \
4072+
"$P_CLI debug_level=3 tickets=0 reconnect=1 reco_delay=2000" \
40734073
0 \
40744074
-s "session successfully restored from cache" \
40754075
-S "session successfully restored from ticket" \
@@ -4205,7 +4205,7 @@ requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
42054205
requires_config_enabled MBEDTLS_SSL_CACHE_C
42064206
run_test "Session resume using cache, DTLS: timeout < delay" \
42074207
"$P_SRV dtls=1 debug_level=3 tickets=0 cache_timeout=1" \
4208-
"$P_CLI dtls=1 debug_level=3 tickets=0 reconnect=1 skip_close_notify=1 reco_delay=2" \
4208+
"$P_CLI dtls=1 debug_level=3 tickets=0 reconnect=1 skip_close_notify=1 reco_delay=2000" \
42094209
0 \
42104210
-S "session successfully restored from cache" \
42114211
-S "session successfully restored from ticket" \
@@ -4216,7 +4216,7 @@ requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
42164216
requires_config_enabled MBEDTLS_SSL_CACHE_C
42174217
run_test "Session resume using cache, DTLS: no timeout" \
42184218
"$P_SRV dtls=1 debug_level=3 tickets=0 cache_timeout=0" \
4219-
"$P_CLI dtls=1 debug_level=3 tickets=0 reconnect=1 skip_close_notify=1 reco_delay=2" \
4219+
"$P_CLI dtls=1 debug_level=3 tickets=0 reconnect=1 skip_close_notify=1 reco_delay=2000" \
42204220
0 \
42214221
-s "session successfully restored from cache" \
42224222
-S "session successfully restored from ticket" \
@@ -9760,7 +9760,7 @@ run_test "DTLS fragmenting: proxy MTU, resumed handshake" \
97609760
key_file=data_files/server8.key \
97619761
hs_timeout=10000-60000 \
97629762
force_ciphersuite=TLS-ECDHE-ECDSA-WITH-AES-128-GCM-SHA256 \
9763-
mtu=1450 reconnect=1 skip_close_notify=1 reco_delay=1" \
9763+
mtu=1450 reconnect=1 skip_close_notify=1 reco_delay=1000" \
97649764
0 \
97659765
-S "autoreduction" \
97669766
-s "found fragmented DTLS handshake message" \

0 commit comments

Comments
 (0)