Changeset 21181b2 in mod_gnutls

Timestamp:

Mar 14, 2016, 4:05:13 PM (3 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, master, upstream

Children:

a0161fe

Parents:

c0c4106

Message:

Test suite: Enable OCSP if OpenSSL is available, provide port for responder

Tests must Define OCSP_PORT in their apache.conf to enable the OCSP
responder port.

Files:

• configure.ac (modified) (2 diffs)
• test/Makefile.am (modified) (2 diffs)
• test/ocsp_server.conf (modified) (1 diff)

configure.ac

@@ -81 +81 @@
                [test "$enable_flock" = "no" || test "$flock_works" = "no"])
 
-# TODO: check for openssl ocsp
-AM_CONDITIONAL([ENABLE_OCSP_TEST], [true])
+# openssl is needed as the responder for OCSP tests
+AC_PATH_PROG([OPENSSL], [openssl], [no])
+AM_CONDITIONAL([ENABLE_OCSP_TEST], [test "${OPENSSL}" != "no"])
 
 dnl Enable test namespaces? Default is "yes".
@@ -208 +209 @@
 
 dnl Build list of "Listen" statements for Apache
-LISTEN_LIST="# Listen addresses for the test servers"
+LISTEN_LIST="@%:@ Listen addresses for the test servers"
 for i in ${TEST_IP}; do
         LISTEN_LIST="${LISTEN_LIST}
 Listen ${i}:\${TEST_PORT}"
 done
-dnl HTTP ports, only active if TEST_HTTP_PORT is defined
+# Available extra ports, tests can "Define" variables of the listed
+# names in their apache.conf to enable them.
+for j in TEST_HTTP_PORT OCSP_PORT; do
 LISTEN_LIST="${LISTEN_LIST}
-<IfDefine TEST_HTTP_PORT>"
+<IfDefine ${j}>"
 for i in ${TEST_IP}; do
         LISTEN_LIST="${LISTEN_LIST}
-        Listen ${i}:\${TEST_HTTP_PORT}"
+        Listen ${i}:\${${j}}"
 done
 LISTEN_LIST="${LISTEN_LIST}
 </IfDefine>"
+done
 AC_SUBST(LISTEN_LIST)
 AM_SUBST_NOTMAKE(LISTEN_LIST)

test/Makefile.am

@@ -188 +188 @@
 # port for MSVA in test cases that use it
 MSVA_PORT ?= 9933
+# port for OCSP server (Apache vhost if enabled)
+if ENABLE_OCSP_TEST
+OCSP_PORT ?= 9936
+endif
 # maximum time to wait for MSVA startup (milliseconds)
 TEST_MSVA_MAX_WAIT ?= 10000
@@ -213 +217 @@
 endif
 
+if ENABLE_OCSP_TEST
+AM_TESTS_ENVIRONMENT += export OPENSSL="@OPENSSL@"; \
+        export OCSP_PORT="$(OCSP_PORT)";
+endif
+
 if ENABLE_NETNS
 AM_TESTS_ENVIRONMENT += export UNSHARE="@UNSHARE@"; \

test/ocsp_server.conf

@@ -20 +20 @@
                 SetEnv  OCSP_CERT       ${PWD}/ocsp-responder/x509.pem
                 SetEnv  OCSP_KEY        ${PWD}/ocsp-responder/secret.key
+                <If "-n osenv('OPENSSL')">
+                        # Pass OPENSSL variable to CGI script if set
+                        SetEnv  OPENSSL         ${OPENSSL}
+                </If>
         </Location>
         <Directory ${srcdir}/data>