From b45bbdc078ffc1d8cee35c0eb76879442c988343 Mon Sep 17 00:00:00 2001 From: Hideki Miyazaki Date: Thu, 3 Mar 2022 16:36:03 +0900 Subject: [PATCH 1/2] enable early data when enabled all --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 1c076891a..a20805074 100644 --- a/configure.ac +++ b/configure.ac @@ -585,6 +585,8 @@ then test "$enable_trusted_ca" = "" && enable_trusted_ca=yes test "$enable_session_ticket" = "" && enable_session_ticket=yes + test "$enable_earlydata" = "" && enable_earlydata=yes + if test "$ENABLED_32BIT" != "yes" then test "$enable_sha512" = "" && enable_sha512=yes From 90355df4b0984b6132ef27337950926af17449d4 Mon Sep 17 00:00:00 2001 From: Hideki Miyazaki Date: Fri, 4 Mar 2022 08:46:43 +0900 Subject: [PATCH 2/2] disable early data for --enable-distro addressed jenkins failure --- configure.ac | 1 + scripts/tls13.test | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index a20805074..6e17d330d 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,7 @@ then enable_shared=yes enable_static=yes enable_all=yes + enable_earlydata=no REPRODUCIBLE_BUILD_DEFAULT=yes else REPRODUCIBLE_BUILD_DEFAULT=no diff --git a/scripts/tls13.test b/scripts/tls13.test index 3c09db2ae..144ddf3ee 100755 --- a/scripts/tls13.test +++ b/scripts/tls13.test @@ -256,8 +256,11 @@ if [ "$early_data" = "yes" ]; then remove_ready_file grep 'Session Ticket' "$client_out_file" session_ticket=$? - early_data_cnt=`grep 'Early Data' "$server_out_file" | wc -l` - if [ $session_ticket -eq 0 -a $early_data_cnt -ne 4 ]; then + + ed_srv_msgcnt=`grep 'Early Data Client message' "$server_out_file" | wc -l` + ed_srv_status_cnt=`grep 'Early Data was' "$server_out_file" | wc -l` + if [ $session_ticket -eq 0 -a $ed_srv_msgcnt -ne 2 \ + -a $ed_srv_status_cnt -ne 2]; then RESULT=1 fi if [ $RESULT -ne 0 ]; then @@ -283,15 +286,16 @@ if [ "$early_data" = "yes" -a "$psk" = "yes" ]; then # wait for the server to quit and write output wait $server_pid - early_data_cnt=`grep 'Early Data' "$server_out_file" | wc -l` - if [ $early_data_cnt -ne 3 -a $early_data_cnt -ne 5 ]; then + ed_srv_msgcnt=`grep 'Early Data Client message' "$server_out_file" | wc -l` + ed_srv_status_cnt=`grep 'Early Data was' "$server_out_file" | wc -l` + if [ $ed_srv_msgcnt -ne 2 -a $ed_srv_status_cnt -ne 1 ]; then echo echo "Server out file" cat "$server_out_file" echo echo "Found lines" grep 'Early Data' "$server_out_file" - echo -e "\n\nToo few 'Early Data' lines - $early_data_cnt" + echo -e "\n\nUnexpected 'Early Data' lines - $early_data_cnt" RESULT=1 fi if [ $RESULT -ne 0 ]; then