Merge branch 'master' of https://github.com/drwetter/testssl.sh into client_sim_sockets

This commit is contained in:
Frank Breedijk 2016-07-03 19:24:11 +02:00
commit 76955c2c5a
2 changed files with 5 additions and 4 deletions

View File

@ -1,6 +1,7 @@
## Intro ## Intro
[![Build Status](https://travis-ci.org/drwetter/testssl.sh.svg?branch=master)](https://travis-ci.org/drwetter/testssl.sh)
[![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)
`testssl.sh` is a free command line tool which checks a server's service on `testssl.sh` is a free command line tool which checks a server's service on

View File

@ -3977,7 +3977,7 @@ run_client_simulation() {
using_sockets=false using_sockets=false
fi fi
# That service should clients support for simulation? # What service should clients support for simulation?
if [[ "$SERVICE" != "" ]]; then if [[ "$SERVICE" != "" ]]; then
client_service="$SERVICE" client_service="$SERVICE"
else else
@ -5148,7 +5148,7 @@ certificate_info() {
;; ;;
*) *)
out "$cert_sig_algo (" out "$cert_sig_algo ("
pr_warning "FIXME: is unknown" pr_warning "FIXME: can't tell whether this is good or not"
outln ")" outln ")"
fileout "${json_prefix}algorithm" "DEBUG" "Signature Algorithm: $sign_algo" fileout "${json_prefix}algorithm" "DEBUG" "Signature Algorithm: $sign_algo"
;; ;;
@ -5218,7 +5218,7 @@ certificate_info() {
fi fi
else else
out "$cert_keysize bits (" out "$cert_keysize bits ("
pr_warning "FIXME: can't tell whether this is good here or not" pr_warning "FIXME: can't tell whether this is good or not"
outln ")" outln ")"
fileout "${json_prefix}key_size" "WARN" "Server keys $cert_keysize bits (unknown signature algorithm)" fileout "${json_prefix}key_size" "WARN" "Server keys $cert_keysize bits (unknown signature algorithm)"
fi fi
@ -9391,4 +9391,4 @@ fi
exit $? exit $?
# $Id: testssl.sh,v 1.509 2016/06/28 10:21:48 dirkw Exp $ # $Id: testssl.sh,v 1.511 2016/07/01 16:26:03 dirkw Exp $