Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-09-17 17:32:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change for Linux to builtin printf

Browse Source 
This suggested PR changes the order of which printf is being used in
`choose_printf()` so that Linux uses not /usr/bin/printf .
This is for some checks slightly faster.

Also PRINTF is now a tunable parameter which can be set through the enviroment
like PRINTF=/usr/bin/printf ./testssl.sh <cmdline>

It doesn't / shouldn't solve the bug #2783. But it might help to reproduce it.
This commit is contained in:
Dirk
2025-05-22 19:55:36 +02:00
parent 75d8f8aa90
commit 1a4be26afc
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
testssl.sh
View File

@ -241,7 +241,7 @@ SSL_RENEG_WAIT=${SSL_RENEG_WAIT:-0.25} # time between SSL Renegotiation checks
LC_COLLATE="" # ensures certain regex patterns work as expected and aren't localized, see setup_lc_collate() LC_COLLATE="" # ensures certain regex patterns work as expected and aren't localized, see setup_lc_collate()
HAS_LOCALE=false HAS_LOCALE=false
SYSTEM2="" # currently only being used for WSL = bash on windows SYSTEM2="" # currently only being used for WSL = bash on windows
PRINTF="" # which external printf to use. Empty presets the internal one, see #1130 PRINTF="${PRINTF:-''}" # which external printf to use. Empty presets the internal one, see #1130
CIPHERS_BY_STRENGTH_FILE="" CIPHERS_BY_STRENGTH_FILE=""
TLS_DATA_FILE="" # mandatory file for socket-based handshakes TLS_DATA_FILE="" # mandatory file for socket-based handshakes
OPENSSL="" # ~/bin/openssl.$(uname).$(uname -m) if you run this from GitHub. Linux otherwise probably /usr/bin/openssl OPENSSL="" # ~/bin/openssl.$(uname).$(uname -m) if you run this from GitHub. Linux otherwise probably /usr/bin/openssl
@ -21091,19 +21091,26 @@ setup_lc_collate() {
choose_printf() { choose_printf() {
local p ptf local p ptf
# external supplied PRINTF overrides everything
[[ -n "$PRINTF" ]] && [[ -x "$PRINTF" ]] && return 0
# This now (2025) works under Linux and saves time as opposed to /usr/bin/printf.
# This worked on MacOS also before
if type -t printf | grep -q builtin; then
if printf "\xc0\x14\x00\xc0\xff\xee" | hexdump -C | grep -q 'c0 14 00 c0 ff ee'; then
PRINTF=""
return 0
fi
fi
ptf="$(type -aP printf)" ptf="$(type -aP printf)"
if [[ -n "$ptf" ]]; then if [[ -n "$ptf" ]]; then
for p in $ptf; do for p in $ptf; do
if $p "\xc0\x14\xc0\xff\xee" | hexdump -C | grep -q 'c0 14 c0 ff ee'; then if $p "\xc0\x14\x00\xc0\xff\xee" | hexdump -C | grep -q 'c0 14 00 c0 ff ee'; then
PRINTF=$p PRINTF=$p
return 0 return 0
fi fi
done done
fi fi
if type -t printf >/dev/null; then
PRINTF=""
return 0
fi
fatal "Neither external printf nor shell internal found. " $ERR_CLUELESS fatal "Neither external printf nor shell internal found. " $ERR_CLUELESS
} }