Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-01-03 23:39:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

- FIX: socket reset (ccs, hb) made formatting look not ok

Browse Source
This commit is contained in:
Dirk 2014-10-08 14:30:31 +02:00
parent 397b115a47
commit 08202a5768
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
testssl.sh
View File

@ -457,7 +457,7 @@ std_cipherlists() {
socksend() { socksend() {
data=`echo $1 | sed 's/tls_version/'"$2"'/g'` data=`echo $1 | sed 's/tls_version/'"$2"'/g'`
[ $VERBOSE -eq 1 ] && echo "\"$data\"" [ $VERBOSE -eq 1 ] && echo "\"$data\""
out "$data" >&5 & out "$data" >&5 2>/dev/null &
sleep $3 sleep $3
} }
@ -483,8 +483,8 @@ sockread() {
test $maxsleep -eq 0 && break test $maxsleep -eq 0 && break
done done
if ps ax | grep -v grep | grep -q $pid; then if ps ax | grep -v grep | grep -q $pid; then
# time's up and dd is still alive --> tiemout # time's up and dd is still alive --> timeout
kill $pid kill $pid
wait $pid 2>/dev/null wait $pid 2>/dev/null
ret=3 # means killed ret=3 # means killed
fi fi
@ -994,7 +994,7 @@ ccs_injection(){
# see https://www.openssl.org/news/secadv_20140605.txt # see https://www.openssl.org/news/secadv_20140605.txt
# mainly adapted from Ramon de C Valle's C code from https://gist.github.com/rcvalle/71f4b027d61a78c42607 # mainly adapted from Ramon de C Valle's C code from https://gist.github.com/rcvalle/71f4b027d61a78c42607
bold " CCS "; out " (CVE-2014-0224), experimental " bold " CCS "; out " (CVE-2014-0224), experimental "
ccs_message="\x14\x03\tls_version\x00\x01\x01" ccs_message="\x14\x03\tls_version\x00\x01\x01" # ChangeCipherSpec, TLS version 2 bytes, lenght 2 bytes, payload CCS 1 byte
$OPENSSL s_client $STARTTLS -connect $NODEIP:$PORT &>$TMPFILE </dev/null $OPENSSL s_client $STARTTLS -connect $NODEIP:$PORT &>$TMPFILE </dev/null
@ -1067,7 +1067,7 @@ ccs_injection(){
if [ "$reply_sanitized" == "0a" ] || [ "$lines" -gt 1 ] ; then if [ "$reply_sanitized" == "0a" ] || [ "$lines" -gt 1 ] ; then
green "not vulnerable (OK)" green "not vulnerable (OK)"
ret=0 ret=1
else else
red "VULNERABLE" red "VULNERABLE"
ret=1 ret=1
@ -1881,7 +1881,7 @@ case "$1" in
exit $ret ;; exit $ret ;;
esac esac
# $Id: testssl.sh,v 1.120 2014/10/07 23:02:32 dirkw Exp $ # $Id: testssl.sh,v 1.121 2014/10/08 12:30:05 dirkw Exp $
# vim:ts=5:sw=5 # vim:ts=5:sw=5