Skip to content

Commit 08d8039

Browse files
authored
Merge pull request #2681 from testssl/date_not_available
Fix regex for openssl banner
2 parents 9807bc3 + 7bb04e0 commit 08d8039

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

testssl.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20480,11 +20480,14 @@ find_openssl_binary() {
2048020480
case "$OSSL_VER_MAJOR.$OSSL_VER_MINOR" in
2048120481
1.0.2|1.1.0|1.1.1|3.*) HAS_DH_BITS=true ;;
2048220482
esac
20483-
if [[ "$OSSL_NAME" =~ LibreSSL ]]; then
20483+
20484+
OPENSSL_NR_CIPHERS=$(count_ciphers "$(actually_supported_osslciphers 'ALL:COMPLEMENTOFALL' 'ALL')")
20485+
20486+
if [[ $OPENSSL_NR_CIPHERS -le 140 ]]; then
2048420487
[[ ${OSSL_VER//./} -ge 210 ]] && HAS_DH_BITS=true
2048520488
if "$SSL_NATIVE"; then
2048620489
outln
20487-
pr_warning "LibreSSL in native ssl mode is not a good choice for testing INSECURE features!"
20490+
pr_warning "LibreSSL/OpenSSL in native ssl mode with poor cipher support is not a good choice for testing INSECURE features!"
2048820491
fi
2048920492
fi
2049020493

@@ -20573,7 +20576,6 @@ find_openssl_binary() {
2057320576
$OPENSSL s_client -comp </dev/null 2>&1 | grep -aiq "unknown option" || HAS_COMP=true
2057420577
$OPENSSL s_client -no_comp </dev/null 2>&1 | grep -aiq "unknown option" || HAS_NO_COMP=true
2057520578

20576-
OPENSSL_NR_CIPHERS=$(count_ciphers "$(actually_supported_osslciphers 'ALL:COMPLEMENTOFALL' 'ALL')")
2057720579
# The following statement works with OpenSSL 1.0.2, 1.1.1 and 3.0 and LibreSSL 3.4
2057820580
if $OPENSSL s_client -curves </dev/null 2>&1 | grep -aiq "unknown option"; then
2057920581
# LibreSSL (tested with version 3.4.1 and 3.0.2) need -groups instead of -curve
@@ -21152,8 +21154,8 @@ EOF
2115221154

2115321155
# remove clock and dow if the first word is a dow and not a dom (suse)
2115421156
short_built_date=${OSSL_BUILD_DATE/??:??:?? /}
21155-
if [[ ${short_built_date%% *} =~ [A-Za-z]{3} ]]; then
21156-
short_built_date=${short_built_date#* }
21157+
if [[ ${short_built_date%% *} =~ ^[A-Za-z]{3}$ ]]; then
21158+
short_built_date=${short_built_date#* }
2115721159
fi
2115821160
out "${spaces}Using "
2115921161
pr_italic "$OSSL_NAME $OSSL_VER ($short_built_date)"

0 commit comments

Comments
 (0)