wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 03:34:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4918 from miyazakh/enableall_earlydata

Browse Source 
enable early data when specifying `--enable-all` option
This commit is contained in:
Sean Parkinson
2022-03-07 08:05:36 +10:00
committed by GitHub
parent 9be0633ce3 90355df4b0
commit 84beb5ed7b
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@@ -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
@@ -585,6 +586,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

14
scripts/tls13.test
View File

@@ -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