From 15f8fc5a3ffd30cacaa33201d34011cbfd371867 Mon Sep 17 00:00:00 2001 From: David Cooper Date: Thu, 14 Apr 2022 11:01:26 -0400 Subject: [PATCH] Fix run_server_defaults() PR #1960 created a bug by placing code between the call to determine_tls_extensions() and a check of its return code. This commit fixes the problem. --- testssl.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testssl.sh b/testssl.sh index 173943c..1c4ca43 100755 --- a/testssl.sh +++ b/testssl.sh @@ -9961,10 +9961,6 @@ run_server_defaults() { done determine_tls_extensions - "$using_sockets" && cert_compression_methods="$(determine_cert_compression)" - [[ -n "$cert_compression_methods" ]] && [[ "$cert_compression_methods" != "none" ]] && \ - extract_new_tls_extensions "$TEMPDIR/$NODEIP.determine_cert_compression.txt" - if [[ $? -eq 0 ]] && [[ "$OPTIMAL_PROTO" != -ssl2 ]]; then cp "$TEMPDIR/$NODEIP.determine_tls_extensions.txt" $TMPFILE >$ERRFILE @@ -9973,6 +9969,10 @@ run_server_defaults() { sessticket_proto="$(get_protocol "$TMPFILE")" fi fi + "$using_sockets" && cert_compression_methods="$(determine_cert_compression)" + [[ -n "$cert_compression_methods" ]] && [[ "$cert_compression_methods" != "none" ]] && \ + extract_new_tls_extensions "$TEMPDIR/$NODEIP.determine_cert_compression.txt" + if "$using_sockets" && ! "$TLS13_ONLY" && [[ -z "$sessticket_lifetime_hint" ]] && [[ "$OPTIMAL_PROTO" != -ssl2 ]]; then if "$HAS_TLS13" && ( [[ -z "$OPTIMAL_PROTO" ]] || [[ "$OPTIMAL_PROTO" == -tls1_3 ]] ) ; then # If a session ticket were sent in response to a TLSv1.3 ClientHello, then a session ticket