Git
/
testssl.sh
mirror of https://github.com/drwetter/testssl.sh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- minor adjustmentents to program style

This commit is contained in:
Dirk 2015-12-24 23:00:23 +01:00
parent a0e91964d8
commit e10da3a78a
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
testssl.sh
View File

@ -2491,7 +2491,7 @@ run_spdy() {
run_http2() { run_http2() {
local tmpstr local tmpstr
local -i ret=0 local -i ret=0
local had_alpn_proto local had_alpn_proto=false
pr_bold " HTTP2/ALPN " pr_bold " HTTP2/ALPN "
if ! http2_pre ; then if ! http2_pre ; then
@ -2501,17 +2501,19 @@ run_http2() {
for proto in $ALPN_PROTOs; do for proto in $ALPN_PROTOs; do
# for some reason OpenSSL doesn't list the advertised protocols, so instead try common protocols # for some reason OpenSSL doesn't list the advertised protocols, so instead try common protocols
$OPENSSL s_client -connect $NODEIP:$PORT $BUGS $SNI -alpn $proto </dev/null 2>$ERRFILE >$TMPFILE $OPENSSL s_client -connect $NODEIP:$PORT $BUGS $SNI -alpn $proto </dev/null 2>$ERRFILE >$TMPFILE
tmpstr=$(grep -a '^ALPN protocol' $TMPFILE | sed 's/ALPN protocol.*: //') #tmpstr=$(grep -a '^ALPN protocol' $TMPFILE | sed 's/ALPN protocol.*: //')
if [[ "$tmpstr" = "$proto" ]]; then #tmpstr=$(awk '/^ALPN protocol*:/ { print $2 }' $TMPFILE)
if [[ -z "$had_alpn_proto" ]]; then tmpstr=$(awk -F':' '/^ALPN protocol*:/ { print $2 }' $TMPFILE)
if [[ "$tmpstr" == *"$proto" ]]; then
if ! $had_alpn_proto; then
out "$proto" out "$proto"
had_alpn_proto=1 had_alpn_proto=true
else else
out ", $proto" out ", $proto"
fi fi
fi fi
done done
if [ "$had_alpn_proto" ]; then if $had_alpn_proto; then
outln " (offered)" outln " (offered)"
ret=0 ret=0
else else
@ -5478,4 +5480,4 @@ fi
exit $? exit $?
# $Id: testssl.sh,v 1.429 2015/12/22 20:08:51 dirkw Exp $ # $Id: testssl.sh,v 1.430 2015/12/24 22:00:21 dirkw Exp $