2
0
mirror of https://github.com/mozilla/cipherscan.git synced 2024-11-22 14:23:41 +01:00

corrected flow when number of ciphers was shown

First make sure that ${OPENSSLBIN} is correctly set
This commit is contained in:
Peter Mosmans 2014-11-22 18:36:24 +10:00
parent 818bf29b02
commit 81c1809463

View File

@ -660,13 +660,7 @@ do
esac esac
done done
if [ $VERBOSE != 0 ] ; then # echo parameters left: $@
[ -n "$CACERTS" ] && echo "Using trust anchors from $CACERTS"
echo "Loading $($OPENSSLBIN ciphers -v $CIPHERSUITE 2>/dev/null|grep Kx|wc -l) ciphersuites from $(echo -n $($OPENSSLBIN version 2>/dev/null))"
$OPENSSLBIN ciphers ALL 2>/dev/null
fi
# echo paramters left: $@
TEMPTARGET=$(sed -e 's/^.* //'<<<"${@}") TEMPTARGET=$(sed -e 's/^.* //'<<<"${@}")
HOST=$(sed -e 's/:.*//'<<<"${TEMPTARGET}") HOST=$(sed -e 's/:.*//'<<<"${TEMPTARGET}")
@ -691,6 +685,12 @@ if [ ! -x $OPENSSLBIN ]; then
fi fi
fi fi
if [ $VERBOSE != 0 ] ; then
[ -n "$CACERTS" ] && echo "Using trust anchors from $CACERTS"
echo "Loading $($OPENSSLBIN ciphers -v $CIPHERSUITE 2>/dev/null|grep Kx|wc -l) ciphersuites from $(echo -n $($OPENSSLBIN version 2>/dev/null))"
$OPENSSLBIN ciphers ALL 2>/dev/null
fi
SCLIENTARGS=$(sed -e s,${TEMPTARGET},,<<<"${@}") SCLIENTARGS=$(sed -e s,${TEMPTARGET},,<<<"${@}")
debug "sclientargs: $SCLIENTARGS" debug "sclientargs: $SCLIENTARGS"