Changeset afebb9b in mod_gnutls

Timestamp:

Nov 27, 2018, 6:26:04 PM (4 years ago)

Author:

Krista Karppinen <krista.celestia@…>

Branches:

asyncio, debian/master, main, master, proxy-ticket

Children:

9a834cc

Parents:

0e55076

git-author:

Krista Karppinen <krista.celestia@…> (11/27/18 17:40:33)

git-committer:

Krista Karppinen <krista.celestia@…> (11/27/18 18:26:04)

Message:

Add gnutls-cli version requirement to SNI tests

Since the --sni-hostname option doesn't exist in gnutls-cli client
versions prior to 3.5.12, skip the tests using it if an older version
(or no version) is encountered.

Location:

test

Files:

• common.bash (modified) (1 diff)
• test-31_vhost_SNI_serveralias_match.bash (modified) (1 diff)
• test-32_vhost_SNI_serveralias_mismatch.bash (modified) (1 diff)
• test-33_vhost_SNI_serveralias_missinghost.bash (modified) (1 diff)

test/common.bash

@@ -101 +101 @@
     return 0
 }
+
+# Usage: require_gnutls_cli ${REQUIRED_VERSION_NUMBER} || exit ${ERROR_CODE}
+# Require the gnutls-cli binary to be of a given version or newer.
+# Return error code 1 if older, 2 if not found.
+function require_gnutls_cli
+{
+    local required_version=(${1//./ })
+
+    if [[ $(gnutls-cli --version) =~ gnutls-cli[[:space:]]([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+) ]]
+    then
+        for i in {0..2}
+        do
+            if [ ${BASH_REMATCH[i+1]} -gt ${required_version[i]} ]
+            then
+                break;
+            elif [ ${BASH_REMATCH[i+1]} -lt ${required_version[i]} ]
+            then
+                return 1
+            fi
+        done
+        return 0
+    else
+        return 2
+    fi
+}

test/test-31_vhost_SNI_serveralias_match.bash

@@ -1 +1 @@
 #!/bin/bash
+set -e
+: ${srcdir:="."}
+. ${srcdir}/common.bash
+
+require_gnutls_cli 3.5.12 || (echo "Using --sni-hostname requires gnutls-cli version 3.5.12 or newer"; exit 77)
 ${srcdir}/runtests t-31

test/test-32_vhost_SNI_serveralias_mismatch.bash

@@ -1 +1 @@
 #!/bin/bash
+set -e
+: ${srcdir:="."}
+. ${srcdir}/common.bash
+
+require_gnutls_cli 3.5.12 || (echo "Using --sni-hostname requires gnutls-cli version 3.5.12 or newer"; exit 77)
 ${srcdir}/runtests t-32

test/test-33_vhost_SNI_serveralias_missinghost.bash

@@ -1 +1 @@
 #!/bin/bash
+set -e
+: ${srcdir:="."}
+. ${srcdir}/common.bash
+
+require_gnutls_cli 3.5.12 || (echo "Using --sni-hostname requires gnutls-cli version 3.5.12 or newer"; exit 77)
 ${srcdir}/runtests t-33