Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-01-07 09:10:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1780 from drwetter/fix_1779

Browse Source 
Fix 1779
This commit is contained in:
Dirk Wetter 2020-11-20 16:27:10 +01:00 committed by GitHub
commit 7dac1a20f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
testssl.sh
View File

@ -117,7 +117,7 @@ trap "child_error" USR1
########### Internal definitions ########### Internal definitions
# #
declare -r VERSION="3.0.3" declare -r VERSION="3.0.4"
declare -r SWCONTACT="dirk aet testssl dot sh" declare -r SWCONTACT="dirk aet testssl dot sh"
grep -E -q "dev|rc|beta" <<< "$VERSION" && \ grep -E -q "dev|rc|beta" <<< "$VERSION" && \
SWURL="https://testssl.sh/dev/" || SWURL="https://testssl.sh/dev/" ||
@ -1250,10 +1250,6 @@ strip_inconsistent_ciphers() {
return 0 return 0
} }
count_chars() {
echo $(wc -c <<< "$1")
}
newline_to_spaces() { newline_to_spaces() {
tr '\n' ' ' <<< "$1" | sed 's/ $//' tr '\n' ' ' <<< "$1" | sed 's/ $//'
} }
@ -12776,7 +12772,7 @@ sslv2_sockets() {
local cipher_suites="$1" local cipher_suites="$1"
local client_hello len_client_hello local client_hello len_client_hello
local len_ciph_suites_byte len_ciph_suites 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 -i response_len server_hello_len
local parse_complete=false local parse_complete=false
@ -12830,7 +12826,8 @@ sslv2_sockets() {
if [[ -s "$SOCK_REPLY_FILE" ]]; then if [[ -s "$SOCK_REPLY_FILE" ]]; then
server_hello=$(hexdump -v -e '16/1 "%02X"' "$SOCK_REPLY_FILE") server_hello=$(hexdump -v -e '16/1 "%02X"' "$SOCK_REPLY_FILE")
server_hello_len=$((2 + $(hex2dec "${server_hello:1:3}") )) 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 for (( 1; response_len < server_hello_len; 1 )); do
sock_reply_file2=${SOCK_REPLY_FILE}.2 sock_reply_file2=${SOCK_REPLY_FILE}.2
mv "$SOCK_REPLY_FILE" "$sock_reply_file2" mv "$SOCK_REPLY_FILE" "$sock_reply_file2"
@ -12842,10 +12839,12 @@ sslv2_sockets() {
[[ ! -s "$SOCK_REPLY_FILE" ]] && break [[ ! -s "$SOCK_REPLY_FILE" ]] && break
cat "$SOCK_REPLY_FILE" >> "$sock_reply_file2" cat "$SOCK_REPLY_FILE" >> "$sock_reply_file2"
mv "$sock_reply_file2" "$SOCK_REPLY_FILE" mv "$sock_reply_file2" "$SOCK_REPLY_FILE"
response_len=$(count_chars "$SOCK_REPLY_FILE") foo="$(wc -c "$SOCK_REPLY_FILE")"
response_len="${foo% *}"
done done
fi fi
fi fi
debugme echo "reading server hello... " debugme echo "reading server hello... "
if [[ "$DEBUG" -ge 4 ]]; then if [[ "$DEBUG" -ge 4 ]]; then
hexdump -C "$SOCK_REPLY_FILE" | head -6 hexdump -C "$SOCK_REPLY_FILE" | head -6