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

fixed merge conflicts

This commit is contained in:
Dirk 2017-03-18 12:54:01 +01:00
parent 71f446b170 1c9670857b
commit 84a4fafe1e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
testssl.sh
View File

@ -298,14 +298,14 @@ set_severity_level() {
show_finding() { show_finding() {
local severity=$1 local severity=$1
([[ "$severity" == "DEBUG" ]]) || ( [[ "$severity" == "DEBUG" ]] ) ||
([[ "$severity" == "WARN" ]]) || ( [[ "$severity" == "WARN" ]] ) ||
([[ "$severity" == "INFO" ]] && [[ $SEVERITY_LEVEL -le $INFO ]]) || ( [[ "$severity" == "INFO" ]] && [[ $SEVERITY_LEVEL -le $INFO ]] ) ||
([[ "$severity" == "OK" ]] && [[ $SEVERITY_LEVEL -le $OK ]]) || ( [[ "$severity" == "OK" ]] && [[ $SEVERITY_LEVEL -le $OK ]] ) ||
([[ "$severity" == "LOW" ]] && [[ $SEVERITY_LEVEL -le $LOW ]]) || ( [[ "$severity" == "LOW" ]] && [[ $SEVERITY_LEVEL -le $LOW ]] ) ||
([[ "$severity" == "MEDIUM" ]] && [[ $SEVERITY_LEVEL -le $MEDIUM ]]) || ( [[ "$severity" == "MEDIUM" ]] && [[ $SEVERITY_LEVEL -le $MEDIUM ]] ) ||
([[ "$severity" == "HIGH" ]] && [[ $SEVERITY_LEVEL -le $HIGH ]]) || ( [[ "$severity" == "HIGH" ]] && [[ $SEVERITY_LEVEL -le $HIGH ]] ) ||
([[ "$severity" == "CRITICAL" ]] && [[ $SEVERITY_LEVEL -le $CRITICAL ]]) ( [[ "$severity" == "CRITICAL" ]] && [[ $SEVERITY_LEVEL -le $CRITICAL ]] )
} }
@ -918,7 +918,7 @@ fileout_json_finding() {
} }
is_json_format() { is_json_format() {
([[ -f "$JSONFILE" ]] && ("$do_json" || "$do_pretty_json")) ( [[ -f "$JSONFILE" ]] && ("$do_json" || "$do_pretty_json") )
} }
################# JSON FILE FORMATING END #################### ################# JSON FILE FORMATING END ####################