From 0a4059ea7a661e8c5990789e51d662ecd9d7a123 Mon Sep 17 00:00:00 2001 From: Joachim Bauernberger Date: Sun, 25 Oct 2026 19:59:22 +0100 Subject: [PATCH] ssl-opt.sh: Fix detection of a recent gnutls-serv When GNUTLS_NEXT_SERV is not set, ssl-opt.sh uses $GNUTLS_SERV as GNUTLS_NEXT_SERV if it is GnuTLS 3.7 or later. The check matched the output of "$GNUTLS_SERV --version" against "gnutls-cli 3.x", but gnutls-serv identifies itself as "gnutls-serv", for example "gnutls-serv 3.8.13". The check never succeeded, so with the system gnutls-cli and gnutls-serv every test case that requires GnuTLS "next" was skipped. Match "gnutls-serv" in the server check. Signed-off-by: Joachim Bauernberger --- tests/ssl-opt.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh index fd57757aaa..d2b64d8cf1 100755 --- a/tests/ssl-opt.sh +++ b/tests/ssl-opt.sh @@ -91,9 +91,9 @@ fi # If $GNUTLS_SERV is at least 3.7, use it as GNUTLS_NEXT_SERV as well. if [ -z "${GNUTLS_NEXT_SERV:-}" ]; then case $($GNUTLS_SERV --version) in - gnutls-cli\ 3.[1-9][0-9]*) GNUTLS_NEXT_SERV=$GNUTLS_SERV;; - gnutls-cli\ 3.[7-9].*) GNUTLS_NEXT_SERV=$GNUTLS_SERV;; - gnutls-cli\ [4-9]*) GNUTLS_NEXT_SERV=$GNUTLS_SERV;; + gnutls-serv\ 3.[1-9][0-9]*) GNUTLS_NEXT_SERV=$GNUTLS_SERV;; + gnutls-serv\ 3.[7-9].*) GNUTLS_NEXT_SERV=$GNUTLS_SERV;; + gnutls-serv\ [4-9]*) GNUTLS_NEXT_SERV=$GNUTLS_SERV;; esac fi