Changeset 9a834cc in mod_gnutls

Timestamp:

Nov 28, 2018, 10:23:49 AM (4 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

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

Children:

5c56e5b

Parents:

6519eb9 (diff), afebb9b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge gnutls-cli version check

Thanks Krista!

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