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

Merge pull request #1687 from drwetter/polish_1686 

Polish completion of json/csv output
This commit is contained in:
Dirk Wetter 2020-07-20 15:54:56 +02:00 committed by GitHub
parent 1f388d8b94 86c730b74e
commit 43c62b13d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
testssl.sh
View File

@ -20877,6 +20877,7 @@ run_rating() {
pr_bold " Specification documentation "; pr_url "https://github.com/ssllabs/research/wiki/SSL-Server-Rating-Guide" pr_bold " Specification documentation "; pr_url "https://github.com/ssllabs/research/wiki/SSL-Server-Rating-Guide"
outln outln
fileout "rating_spec" "INFO" "SSL Labs's 'SSL Server Rating Guide' (version 2009q from 2020-01-30)" fileout "rating_spec" "INFO" "SSL Labs's 'SSL Server Rating Guide' (version 2009q from 2020-01-30)"
fileout "rating_doc" "INFO" "https://github.com/ssllabs/research/wiki/SSL-Server-Rating-Guide"
# No point in calculating a score, if a cap of "F", "T", or "M" has been set # No point in calculating a score, if a cap of "F", "T", or "M" has been set
if [[ $GRADE_CAP == F || $GRADE_CAP == T || $GRADE_CAP == M ]]; then if [[ $GRADE_CAP == F || $GRADE_CAP == T || $GRADE_CAP == M ]]; then
@ -20893,7 +20894,7 @@ run_rating() {
fileout "cipher_strength_score" "INFO" "0" fileout "cipher_strength_score" "INFO" "0"
fileout "cipher_strength_score_weighted" "INFO" "0" fileout "cipher_strength_score_weighted" "INFO" "0"
fileout "final_score" "INFO" "0" fileout "final_score" "INFO" "0"
fileout "grade" "CRITICAL" "$GRADE_CAP" fileout "overall_grade" "CRITICAL" "$GRADE_CAP"
else else
## Category 1 ## Category 1
# get best score, by searching for the best protocol, until a hit occurs # get best score, by searching for the best protocol, until a hit occurs
@ -21017,22 +21018,22 @@ run_rating() {
pr_bold " Overall Grade " pr_bold " Overall Grade "
case "$final_grade" in case "$final_grade" in
A*) prln_svrty_best $final_grade A*) prln_svrty_best $final_grade
fileout "grade" "OK" "$final_grade" fileout "overall_grade" "OK" "$final_grade"
;; ;;
B) prln_svrty_medium $final_grade B) prln_svrty_medium $final_grade
fileout "grade" "MEDIUM" "$final_grade" fileout "overall_grade" "MEDIUM" "$final_grade"
;; ;;
C) prln_svrty_medium $final_grade C) prln_svrty_medium $final_grade
fileout "grade" "MEDIUM" "$final_grade" fileout "grade" "MEDIUM" "$final_grade"
;; ;;
D) prln_svrty_high $final_grade D) prln_svrty_high $final_grade
fileout "grade" "HIGH" "$final_grade" fileout "overall_grade" "HIGH" "$final_grade"
;; ;;
E) prln_svrty_high $final_grade E) prln_svrty_high $final_grade
fileout "grade" "HIGH" "$final_grade" fileout "overall_grade" "HIGH" "$final_grade"
;; ;;
F) prln_svrty_critical $final_grade F) prln_svrty_critical $final_grade
fileout "grade" "CRITICAL" "$final_grade" fileout "overall_grade" "CRITICAL" "$final_grade"
;; ;;
esac esac
fi fi