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

Merge branch '3.2' into client-renego-refactoring

Browse Source
This commit is contained in:
Emmanuel Fusté 2024-12-09 11:03:42 +01:00
commit f39408086b
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/docker-3.2.yml vendored
View File

@ -48,7 +48,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }} password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push - name: Build and push
uses: docker/build-push-action@v6.9.0 uses: docker/build-push-action@v6.10.0
with: with:
push: ${{ github.event_name != 'pull_request' }} push: ${{ github.event_name != 'pull_request' }}
context: . context: .

3
Readme.md
View File

@ -1,8 +1,7 @@
## Intro ## Intro
<!-- [![Travis CI Status](https://img.shields.io/travis/drwetter/testssl.sh)](https://travis-ci.org/drwetter/testssl.sh) --> [![CI tests](https://github.com/drwetter/testssl.sh/actions/workflows/unit_tests.yml/badge.svg)](https://github.com/drwetter/testssl.sh/actions/workflows/unit_tests.yml)
[![Build Status](https://github.com/drwetter/testssl.sh/actions/workflows/test.yml/badge.svg)](https://github.com/drwetter/testssl.sh/actions/workflows/test.yml)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/drwetter/testssl.sh?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/drwetter/testssl.sh?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![License](https://img.shields.io/github/license/drwetter/testssl.sh)](https://github.com/drwetter/testssl.sh/LICENSE) [![License](https://img.shields.io/github/license/drwetter/testssl.sh)](https://github.com/drwetter/testssl.sh/LICENSE)
[![Docker](https://img.shields.io/docker/pulls/drwetter/testssl.sh)](https://github.com/drwetter/testssl.sh/blob/3.2/Dockerfile.md) [![Docker](https://img.shields.io/docker/pulls/drwetter/testssl.sh)](https://github.com/drwetter/testssl.sh/blob/3.2/Dockerfile.md)

8
testssl.sh
View File

@ -1371,13 +1371,17 @@ fileout_insert_warning() {
[[ "$CMDLINE=" =~ -iL ]] && return 0 [[ "$CMDLINE=" =~ -iL ]] && return 0
# Note we still have the message on screen + in HTML which is not as optimal as it could be # Note we still have the message on screen + in HTML which is not as optimal as it could be
if "$do_pretty_json" && "$JSONHEADER"; then # See #2599. The "clientProblem" wrapper should only be added if fileout_insert_warning()
# is called before fileout_banner(). The only instance in which this function is called
# after fileout_banner() is in the case of a TLS 1.3 only server when $OPENSSL does not
# support TLS 1.3.
if "$do_pretty_json" && "$JSONHEADER" && ! "$TLS13_ONLY"; then
echo -e " \"clientProblem${CLIENT_PROB_NO}\" : [" >>"$JSONFILE" echo -e " \"clientProblem${CLIENT_PROB_NO}\" : [" >>"$JSONFILE"
CLIENT_PROB_NO=$((CLIENT_PROB_NO + 1)) CLIENT_PROB_NO=$((CLIENT_PROB_NO + 1))
FIRST_FINDING=true # make sure we don't have a comma here FIRST_FINDING=true # make sure we don't have a comma here
fi fi
fileout "$1" "$2" "$3" fileout "$1" "$2" "$3"
if "$do_pretty_json"; then if "$do_pretty_json" && ! "$TLS13_ONLY"; then
if "$JSONHEADER"; then if "$JSONHEADER"; then
echo -e "\n ]," >>"$JSONFILE" echo -e "\n ]," >>"$JSONFILE"
else else