eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5070 from mpg/fix-resumption-openssl-client-tests

Browse source 
Use newer OpenSSL for tests failing with the old
This commit is contained in:
Gilles Peskine 2021-10-13 21:05:15 +02:00 • committed by GitHub
commit 1c66bf8061
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/ssl-opt.sh
View file

@ -753,7 +753,7 @@ wait_client_done() {
# check if the given command uses dtls and sets global variable DTLS # check if the given command uses dtls and sets global variable DTLS
detect_dtls() { detect_dtls() {
case "$1" in case "$1" in
*dtls=1*|-dtls|-u) DTLS=1;; *dtls=1*|*-dtls*|*-u*) DTLS=1;;
*) DTLS=0;; *) DTLS=0;;
esac esac
} }
@ -1309,22 +1309,24 @@ SRV_DELAY_SECONDS=0
# fix commands to use this port, force IPv4 while at it # fix commands to use this port, force IPv4 while at it
# +SRV_PORT will be replaced by either $SRV_PORT or $PXY_PORT later # +SRV_PORT will be replaced by either $SRV_PORT or $PXY_PORT later
# Note: Using 'localhost' rather than 127.0.0.1 here is unwise, as on many
# machines that will resolve to ::1, and we don't want ipv6 here.
P_SRV="$P_SRV server_addr=127.0.0.1 server_port=$SRV_PORT" P_SRV="$P_SRV server_addr=127.0.0.1 server_port=$SRV_PORT"
P_CLI="$P_CLI server_addr=127.0.0.1 server_port=+SRV_PORT" P_CLI="$P_CLI server_addr=127.0.0.1 server_port=+SRV_PORT"
P_PXY="$P_PXY server_addr=127.0.0.1 server_port=$SRV_PORT listen_addr=127.0.0.1 listen_port=$PXY_PORT ${SEED:+"seed=$SEED"}" P_PXY="$P_PXY server_addr=127.0.0.1 server_port=$SRV_PORT listen_addr=127.0.0.1 listen_port=$PXY_PORT ${SEED:+"seed=$SEED"}"
O_SRV="$O_SRV -accept $SRV_PORT" O_SRV="$O_SRV -accept $SRV_PORT"
O_CLI="$O_CLI -connect localhost:+SRV_PORT" O_CLI="$O_CLI -connect 127.0.0.1:+SRV_PORT"
G_SRV="$G_SRV -p $SRV_PORT" G_SRV="$G_SRV -p $SRV_PORT"
G_CLI="$G_CLI -p +SRV_PORT" G_CLI="$G_CLI -p +SRV_PORT"
if [ -n "${OPENSSL_LEGACY:-}" ]; then if [ -n "${OPENSSL_LEGACY:-}" ]; then
O_LEGACY_SRV="$O_LEGACY_SRV -accept $SRV_PORT -dhparam data_files/dhparams.pem" O_LEGACY_SRV="$O_LEGACY_SRV -accept $SRV_PORT -dhparam data_files/dhparams.pem"
O_LEGACY_CLI="$O_LEGACY_CLI -connect localhost:+SRV_PORT" O_LEGACY_CLI="$O_LEGACY_CLI -connect 127.0.0.1:+SRV_PORT"
fi fi
if [ -n "${OPENSSL_NEXT:-}" ]; then if [ -n "${OPENSSL_NEXT:-}" ]; then
O_NEXT_SRV="$O_NEXT_SRV -accept $SRV_PORT" O_NEXT_SRV="$O_NEXT_SRV -accept $SRV_PORT"
O_NEXT_CLI="$O_NEXT_CLI -connect localhost:+SRV_PORT" O_NEXT_CLI="$O_NEXT_CLI -connect 127.0.0.1:+SRV_PORT"
fi fi
if [ -n "${GNUTLS_NEXT_SERV:-}" ]; then if [ -n "${GNUTLS_NEXT_SERV:-}" ]; then
@ -2694,10 +2696,13 @@ run_test "Session resume using tickets, DTLS: openssl server" \
-c "parse new session ticket" \ -c "parse new session ticket" \
-c "a session has been resumed" -c "a session has been resumed"
# For reasons that aren't fully understood, this test randomly fails with high
# probability with OpenSSL 1.0.2g on the CI, see #5012.
requires_openssl_next
run_test "Session resume using tickets, DTLS: openssl client" \ run_test "Session resume using tickets, DTLS: openssl client" \
"$P_SRV dtls=1 debug_level=3 tickets=1" \ "$P_SRV dtls=1 debug_level=3 tickets=1" \
"( $O_CLI -dtls -sess_out $SESSION; \ "( $O_NEXT_CLI -dtls -sess_out $SESSION; \
$O_CLI -dtls -sess_in $SESSION; \ $O_NEXT_CLI -dtls -sess_in $SESSION; \
rm -f $SESSION )" \ rm -f $SESSION )" \
0 \ 0 \
-s "found session ticket extension" \ -s "found session ticket extension" \
@ -2894,10 +2899,13 @@ run_test "Session resume using cache, DTLS: session copy" \
-s "a session has been resumed" \ -s "a session has been resumed" \
-c "a session has been resumed" -c "a session has been resumed"
# For reasons that aren't fully understood, this test randomly fails with high
# probability with OpenSSL 1.0.2g on the CI, see #5012.
requires_openssl_next
run_test "Session resume using cache, DTLS: openssl client" \ run_test "Session resume using cache, DTLS: openssl client" \
"$P_SRV dtls=1 debug_level=3 tickets=0" \ "$P_SRV dtls=1 debug_level=3 tickets=0" \
"( $O_CLI -dtls -sess_out $SESSION; \ "( $O_NEXT_CLI -dtls -sess_out $SESSION; \
$O_CLI -dtls -sess_in $SESSION; \ $O_NEXT_CLI -dtls -sess_in $SESSION; \
rm -f $SESSION )" \ rm -f $SESSION )" \
0 \ 0 \
-s "found session ticket extension" \ -s "found session ticket extension" \