Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-10-30 21:35:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

make 0964cbc5d3 easier in execution (session resumption)

Browse Source
This commit is contained in:
Dirk
2017-12-31 21:10:41 +01:00
parent 0964cbc5d3
commit a3b4609d24
1 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
testssl.sh
View File

@@ -5037,6 +5037,11 @@ sub_session_resumption() {
$OPENSSL s_client $(s_client_options "$STARTTLS $BUGS -connect $NODEIP:$PORT $PROXY $SNI $addcmd -sess_out $sess_data") </dev/null &>/dev/null $OPENSSL s_client $(s_client_options "$STARTTLS $BUGS -connect $NODEIP:$PORT $PROXY $SNI $addcmd -sess_out $sess_data") </dev/null &>/dev/null
ret1=$? ret1=$?
if "$byID" && [[ $OSSL_VER_MINOR == "1.1" ]] && [[ $OSSL_VER_MAJOR == "1" ]] && [[ ! -s "$sess_data" ]]; then
# it seems OpenSSL indicates no Session ID resumption by just not generating ouput
debugme echo -n "No session resumption byID (empty file)"
ret=2
else
$OPENSSL s_client $(s_client_options "$STARTTLS $BUGS -connect $NODEIP:$PORT $PROXY $SNI $addcmd -sess_in $sess_data") </dev/null >$tmpfile 2>$ERRFILE $OPENSSL s_client $(s_client_options "$STARTTLS $BUGS -connect $NODEIP:$PORT $PROXY $SNI $addcmd -sess_in $sess_data") </dev/null >$tmpfile 2>$ERRFILE
ret2=$? ret2=$?
debugme echo "$ret1, $ret2, [[ -s "$sess_data" ]]" debugme echo "$ret1, $ret2, [[ -s "$sess_data" ]]"
@@ -5057,10 +5062,6 @@ sub_session_resumption() {
elif ! "$new_sid2" && ! "$new_sid"; then elif ! "$new_sid2" && ! "$new_sid"; then
debugme echo -n "Session resumption " debugme echo -n "Session resumption "
ret=0 ret=0
elif "$byID" && [[ $OSSL_VER_MINOR == "1.1" ]] && [[ $OSSL_VER_MAJOR == "1" ]] && [[ ! -s "$sess_data" ]]; then
# it seems OpenSSL indicates no Session ID resumption by just not generating ouput
debugme echo -n "No session resumption (empty file) "
ret=2
else else
debugme echo -n "unclear status: $ret1, $ret2, $new_sid, $new_sid2 -- " debugme echo -n "unclear status: $ret1, $ret2, $new_sid, $new_sid2 -- "
ret=7 ret=7
@@ -5068,7 +5069,7 @@ sub_session_resumption() {
if [[ $DEBUG -ge 2 ]]; then if [[ $DEBUG -ge 2 ]]; then
"$byID" && echo "byID" || echo "by ticket" "$byID" && echo "byID" || echo "by ticket"
fi fi
fi
"$byID" && \ "$byID" && \
tmpfile_handle $FUNCNAME.byID.log $tmpfile || \ tmpfile_handle $FUNCNAME.byID.log $tmpfile || \
tmpfile_handle $FUNCNAME.byticket.log $tmpfile tmpfile_handle $FUNCNAME.byticket.log $tmpfile