Skip to content

Commit 4ce91d7

Browse files
committed
Explain OSSL_SHORTCUT better, "automagically" is the word we wanted to use
1 parent c5b07e7 commit 4ce91d7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

testssl.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ TLS_DATA_FILE="" # mandatory file for socket-based handsh
246246
OPENSSL="" # ~/bin/openssl.$(uname).$(uname -m) if you run this from GitHub. Linux otherwise probably /usr/bin/openssl
247247
OPENSSL2=${OPENSSL2:-/usr/bin/openssl} # This will be openssl version >=1.1.1 (auto determined) as opposed to openssl-bad (OPENSSL)
248248
OPENSSL2_HAS_TLS_1_3=false # If we run with supplied binary AND $OPENSSL2 supports TLS 1.3 this will be set to true
249-
OSSL_SHORTCUT=${OSSL_SHORTCUT:-true} # Hack: if during the scan turns out the OpenSSL binary supports TLS 1.3 would be a better choice
249+
OSSL_SHORTCUT=${OSSL_SHORTCUT:-true} # If you don't want automagically switch from $OPENSSL to $OPENSSL2 for TLS 1.3 hosts, set this to false
250250
OPENSSL_LOCATION=""
251251
IKNOW_FNAME=false
252252
FIRST_FINDING=true # is this the first finding we are outputting to file?
@@ -22039,8 +22039,8 @@ determine_optimal_proto() {
2203922039
if "$OPENSSL2_HAS_TLS_1_3"; then
2204022040
if "$OSSL_SHORTCUT" || [[ "$WARNINGS" == batch ]]; then
2204122041
# switch w/o asking
22042-
OPEN_MSG=" $NODE:$PORT appeared to support TLS 1.3 ONLY. Thus switched implicitly from\n \"$OPENSSL\" to \"$OPENSSL2\"."
22043-
fileout "$jsonID" "INFO" "$NODE:$PORT appears to support TLS 1.3 ONLY, switching from $OPENSSL to $OPENSSL2 was implicitly enforced"
22042+
OPEN_MSG=" $NODE:$PORT appeared to support TLS 1.3 ONLY. Thus switched automagically from\n \"$OPENSSL\" to \"$OPENSSL2\"."
22043+
fileout "$jsonID" "INFO" "$NODE:$PORT appears to support TLS 1.3 ONLY, switching from $OPENSSL to $OPENSSL2 automagically"
2204422044
OPENSSL="$OPENSSL2"
2204522045
find_openssl_binary
2204622046
prepare_arrays

0 commit comments

Comments
 (0)