diff -Nru testssl.sh-3.0.3+dfsg1/debian/changelog testssl.sh-3.0.4+dfsg1/debian/changelog --- testssl.sh-3.0.3+dfsg1/debian/changelog 2020-11-20 03:42:46.000000000 +0000 +++ testssl.sh-3.0.4+dfsg1/debian/changelog 2020-11-23 00:46:09.000000000 +0000 @@ -1,3 +1,10 @@ +testssl.sh (3.0.4+dfsg1-1) unstable; urgency=medium + + * New upstream version 3.0.4+dfsg1. + - Refresh patch. + + -- Unit 193 Sun, 22 Nov 2020 19:46:09 -0500 + testssl.sh (3.0.3+dfsg1-1) unstable; urgency=medium * New upstream version 3.0.3+dfsg1. diff -Nru testssl.sh-3.0.3+dfsg1/debian/patches/allow_loading_config.patch testssl.sh-3.0.4+dfsg1/debian/patches/allow_loading_config.patch --- testssl.sh-3.0.3+dfsg1/debian/patches/allow_loading_config.patch 2020-11-20 03:41:37.000000000 +0000 +++ testssl.sh-3.0.4+dfsg1/debian/patches/allow_loading_config.patch 2020-11-23 00:45:46.000000000 +0000 @@ -8,8 +8,8 @@ testssl.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---- a/testssl.sh 2020-11-19 20:33:49.423167842 -0500 -+++ b/testssl.sh 2020-11-19 20:33:49.375168268 -0500 +--- a/testssl.sh 2020-11-22 19:45:43.298090552 -0500 ++++ b/testssl.sh 2020-11-22 19:45:43.274090766 -0500 @@ -132,7 +132,7 @@ declare -r SYSTEM="$(uname -s)" declare -r SYSTEMREV="$(uname -r)" @@ -19,7 +19,7 @@ CA_BUNDLES_PATH="${CA_BUNDLES_PATH:-""}" # You can have your stores some place else ADDITIONAL_CA_FILES="${ADDITIONAL_CA_FILES:-""}" # single file with a CA in PEM format or comma separated lists of them CIPHERS_BY_STRENGTH_FILE="" -@@ -2470,7 +2470,7 @@ +@@ -2466,7 +2466,7 @@ local -i i nrsaved local first_hpkp_header local spki @@ -28,7 +28,7 @@ if [[ ! -s $HEADERFILE ]]; then run_http_header "$1" || return 1 -@@ -4576,9 +4576,9 @@ +@@ -4572,9 +4572,9 @@ local client_service="" # source the external file @@ -40,7 +40,7 @@ return 1 fi -@@ -6960,7 +6960,7 @@ +@@ -6956,7 +6956,7 @@ # if you run testssl.sh from a different path /you can set either TESTSSL_INSTALL_DIR or CA_BUNDLES_PATH to find the CA BUNDLES if [[ -z "$CA_BUNDLES_PATH" ]]; then @@ -49,7 +49,7 @@ else ca_bundles="$CA_BUNDLES_PATH/*.pem" fi -@@ -15172,7 +15172,7 @@ +@@ -15171,7 +15171,7 @@ local spaces="$3" local dh_p="" local -i subret=0 @@ -58,7 +58,7 @@ local -i lineno_matched=0 "$HAS_PKEY" || return 2 -@@ -16828,16 +16828,16 @@ +@@ -16827,16 +16827,16 @@ DISPLAY_CIPHERNAMES="openssl-only" debugme echo "$CIPHERS_BY_STRENGTH_FILE" prln_warning "\nATTENTION: No cipher mapping file found!" diff -Nru testssl.sh-3.0.3+dfsg1/testssl.sh testssl.sh-3.0.4+dfsg1/testssl.sh --- testssl.sh-3.0.3+dfsg1/testssl.sh 2020-11-19 08:41:12.000000000 +0000 +++ testssl.sh-3.0.4+dfsg1/testssl.sh 2020-11-20 15:27:10.000000000 +0000 @@ -117,7 +117,7 @@ ########### Internal definitions # -declare -r VERSION="3.0.3" +declare -r VERSION="3.0.4" declare -r SWCONTACT="dirk aet testssl dot sh" grep -E -q "dev|rc|beta" <<< "$VERSION" && \ SWURL="https://testssl.sh/dev/" || @@ -1250,10 +1250,6 @@ return 0 } -count_chars() { - echo $(wc -c <<< "$1") -} - newline_to_spaces() { tr '\n' ' ' <<< "$1" | sed 's/ $//' } @@ -12776,7 +12772,7 @@ local cipher_suites="$1" local client_hello len_client_hello local len_ciph_suites_byte len_ciph_suites - local server_hello sock_reply_file2 + local server_hello sock_reply_file2 foo local -i response_len server_hello_len local parse_complete=false @@ -12830,7 +12826,8 @@ if [[ -s "$SOCK_REPLY_FILE" ]]; then server_hello=$(hexdump -v -e '16/1 "%02X"' "$SOCK_REPLY_FILE") server_hello_len=$((2 + $(hex2dec "${server_hello:1:3}") )) - response_len=$(count_chars "$SOCK_REPLY_FILE") + foo="$(wc -c "$SOCK_REPLY_FILE")" + response_len="${foo% *}" for (( 1; response_len < server_hello_len; 1 )); do sock_reply_file2=${SOCK_REPLY_FILE}.2 mv "$SOCK_REPLY_FILE" "$sock_reply_file2" @@ -12842,10 +12839,12 @@ [[ ! -s "$SOCK_REPLY_FILE" ]] && break cat "$SOCK_REPLY_FILE" >> "$sock_reply_file2" mv "$sock_reply_file2" "$SOCK_REPLY_FILE" - response_len=$(count_chars "$SOCK_REPLY_FILE") + foo="$(wc -c "$SOCK_REPLY_FILE")" + response_len="${foo% *}" done fi fi + debugme echo "reading server hello... " if [[ "$DEBUG" -ge 4 ]]; then hexdump -C "$SOCK_REPLY_FILE" | head -6