Skip to content

Commit a15af37

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 can improve the fail rate from 4% to 92%. Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
1 parent f05b6ee commit a15af37

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
@@ -274,7 +274,7 @@ requires_any_configs_enabled MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_
274274
MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED
275275
run_test "TLS 1.3 m->G: EarlyData: basic check, good" \
276276
"$G_NEXT_SRV -d 10 --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+CIPHER-ALL:+ECDHE-PSK:+PSK --earlydata --disable-client-cert" \
277-
"$P_CLI debug_level=4 early_data=1 reco_mode=1 reconnect=1 reco_delay=2" \
277+
"$P_CLI debug_level=4 early_data=1 reco_mode=1 reconnect=1 reco_delay=900" \
278278
1 \
279279
-c "Reconnecting with saved session" \
280280
-c "NewSessionTicket: early_data(42) extension received." \
@@ -295,7 +295,7 @@ requires_any_configs_enabled MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_
295295
MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED
296296
run_test "TLS 1.3 m->G: EarlyData: no early_data in NewSessionTicket, good" \
297297
"$G_NEXT_SRV -d 10 --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+CIPHER-ALL:+ECDHE-PSK:+PSK --disable-client-cert" \
298-
"$P_CLI debug_level=4 early_data=1 reco_mode=1 reconnect=1 reco_delay=2" \
298+
"$P_CLI debug_level=4 early_data=1 reco_mode=1 reconnect=1" \
299299
0 \
300300
-c "Reconnecting with saved session" \
301301
-C "NewSessionTicket: early_data(42) extension received." \

‎tests/ssl-opt.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -3632,7 +3632,7 @@ run_test "Session resume using tickets: cache disabled" \
36323632
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
36333633
run_test "Session resume using tickets: timeout" \
36343634
"$P_SRV debug_level=3 tickets=1 cache_max=0 ticket_timeout=1" \
3635-
"$P_CLI debug_level=3 tickets=1 reconnect=1 reco_delay=2" \
3635+
"$P_CLI debug_level=3 tickets=1 reconnect=1 reco_delay=2000" \
36363636
0 \
36373637
-c "client hello, adding session ticket extension" \
36383638
-s "found session ticket extension" \
@@ -3942,7 +3942,7 @@ run_test "Session resume using tickets, DTLS: cache disabled" \
39423942
requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
39433943
run_test "Session resume using tickets, DTLS: timeout" \
39443944
"$P_SRV debug_level=3 dtls=1 tickets=1 cache_max=0 ticket_timeout=1" \
3945-
"$P_CLI debug_level=3 dtls=1 tickets=1 reconnect=1 skip_close_notify=1 reco_delay=2" \
3945+
"$P_CLI debug_level=3 dtls=1 tickets=1 reconnect=1 skip_close_notify=1 reco_delay=2000" \
39463946
0 \
39473947
-c "client hello, adding session ticket extension" \
39483948
-s "found session ticket extension" \
@@ -4066,7 +4066,7 @@ requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
40664066
requires_config_enabled MBEDTLS_SSL_CACHE_C
40674067
run_test "Session resume using cache: timeout < delay" \
40684068
"$P_SRV debug_level=3 tickets=0 cache_timeout=1" \
4069-
"$P_CLI debug_level=3 tickets=0 reconnect=1 reco_delay=2" \
4069+
"$P_CLI debug_level=3 tickets=0 reconnect=1 reco_delay=2000" \
40704070
0 \
40714071
-S "session successfully restored from cache" \
40724072
-S "session successfully restored from ticket" \
@@ -4077,7 +4077,7 @@ requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
40774077
requires_config_enabled MBEDTLS_SSL_CACHE_C
40784078
run_test "Session resume using cache: no timeout" \
40794079
"$P_SRV debug_level=3 tickets=0 cache_timeout=0" \
4080-
"$P_CLI debug_level=3 tickets=0 reconnect=1 reco_delay=2" \
4080+
"$P_CLI debug_level=3 tickets=0 reconnect=1 reco_delay=2000" \
40814081
0 \
40824082
-s "session successfully restored from cache" \
40834083
-S "session successfully restored from ticket" \
@@ -4213,7 +4213,7 @@ requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
42134213
requires_config_enabled MBEDTLS_SSL_CACHE_C
42144214
run_test "Session resume using cache, DTLS: timeout < delay" \
42154215
"$P_SRV dtls=1 debug_level=3 tickets=0 cache_timeout=1" \
4216-
"$P_CLI dtls=1 debug_level=3 tickets=0 reconnect=1 skip_close_notify=1 reco_delay=2" \
4216+
"$P_CLI dtls=1 debug_level=3 tickets=0 reconnect=1 skip_close_notify=1 reco_delay=2000" \
42174217
0 \
42184218
-S "session successfully restored from cache" \
42194219
-S "session successfully restored from ticket" \
@@ -4224,7 +4224,7 @@ requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
42244224
requires_config_enabled MBEDTLS_SSL_CACHE_C
42254225
run_test "Session resume using cache, DTLS: no timeout" \
42264226
"$P_SRV dtls=1 debug_level=3 tickets=0 cache_timeout=0" \
4227-
"$P_CLI dtls=1 debug_level=3 tickets=0 reconnect=1 skip_close_notify=1 reco_delay=2" \
4227+
"$P_CLI dtls=1 debug_level=3 tickets=0 reconnect=1 skip_close_notify=1 reco_delay=2000" \
42284228
0 \
42294229
-s "session successfully restored from cache" \
42304230
-S "session successfully restored from ticket" \
@@ -9880,7 +9880,7 @@ run_test "DTLS fragmenting: proxy MTU, resumed handshake" \
98809880
key_file=data_files/server8.key \
98819881
hs_timeout=10000-60000 \
98829882
force_ciphersuite=TLS-ECDHE-ECDSA-WITH-AES-128-GCM-SHA256 \
9883-
mtu=1450 reconnect=1 skip_close_notify=1 reco_delay=1" \
9883+
mtu=1450 reconnect=1 skip_close_notify=1 reco_delay=1000" \
98849884
0 \
98859885
-S "autoreduction" \
98869886
-s "found fragmented DTLS handshake message" \

0 commit comments

Comments
 (0)