Changes in / [c6cfe6e:9e309ae] in mod_gnutls


Ignore:
Files:
6 added
6 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    rc6cfe6e r9e309ae  
    8080AM_CONDITIONAL([DISABLE_FLOCK],
    8181               [test "$enable_flock" = "no" || test "$flock_works" = "no"])
     82
     83# openssl is needed as the responder for OCSP tests
     84AC_PATH_PROG([OPENSSL], [openssl], [no])
     85AM_CONDITIONAL([ENABLE_OCSP_TEST], [test "${OPENSSL}" != "no"])
    8286
    8387dnl Enable test namespaces? Default is "yes".
     
    205209
    206210dnl Build list of "Listen" statements for Apache
    207 LISTEN_LIST="# Listen addresses for the test servers"
     211LISTEN_LIST="@%:@ Listen addresses for the test servers"
    208212for i in ${TEST_IP}; do
    209213        LISTEN_LIST="${LISTEN_LIST}
    210214Listen ${i}:\${TEST_PORT}"
    211215done
    212 dnl HTTP ports, only active if TEST_HTTP_PORT is defined
     216# Available extra ports, tests can "Define" variables of the listed
     217# names in their apache.conf to enable them.
     218for j in TEST_HTTP_PORT OCSP_PORT; do
    213219LISTEN_LIST="${LISTEN_LIST}
    214 <IfDefine TEST_HTTP_PORT>"
     220<IfDefine ${j}>"
    215221for i in ${TEST_IP}; do
    216222        LISTEN_LIST="${LISTEN_LIST}
    217         Listen ${i}:\${TEST_HTTP_PORT}"
     223        Listen ${i}:\${${j}}"
    218224done
    219225LISTEN_LIST="${LISTEN_LIST}
    220226</IfDefine>"
     227done
    221228AC_SUBST(LISTEN_LIST)
    222229AM_SUBST_NOTMAKE(LISTEN_LIST)
  • test/.gitignore

    rc6cfe6e r9e309ae  
    88authority
    99imposter
     10ocsp-responder
    1011rogueca
    1112rogueclient
     
    2122*.trs
    2223*.lock
     24gen_ocsp_index
     25.deps
  • test/Makefile.am

    rc6cfe6e r9e309ae  
    3333TESTS = $(dist_check_SCRIPTS)
    3434
     35# build OCSP database tool
     36if ENABLE_OCSP_TEST
     37check_PROGRAMS = gen_ocsp_index
     38gen_ocsp_index_SOURCES = gen_ocsp_index.c cert_helper.c
     39noinst_HEADERS = cert_helper.h
     40endif
     41
    3542# Identities in the miniature CA, server, and client environment for
    3643# the test suite
     
    3845pgp_identities = $(shared_identities)
    3946x509_only_identities = rogueclient
     47if ENABLE_OCSP_TEST
     48x509_only_identities += ocsp-responder
     49endif
    4050x509_identities = $(shared_identities) $(x509_only_identities)
    4151identities = $(shared_identities) $(x509_only_identities)
     
    7181
    7282cert_templates = authority.template.in client.template.in \
    73         imposter.template.in rogueca.template rogueclient.template.in \
    74         server.template.in
     83        imposter.template.in ocsp-responder.template rogueca.template \
     84        rogueclient.template.in server.template.in
    7585generated_templates = authority.template client.template \
    7686        imposter.template rogueclient.template server.template
     
    113123endif
    114124
     125# rules to build OCSP database
     126if ENABLE_OCSP_TEST
     127check_DATA += authority/ocsp_index.txt
     128MOSTLYCLEANFILES += authority/ocsp_index.txt authority/ocsp_index.txt.attr
     129authority/ocsp_index.txt: $(x509_tokens) gen_ocsp_index authority/ocsp_index.txt.attr
     130        ./gen_ocsp_index server/x509.pem client/x509.pem > $@
     131
     132authority/ocsp_index.txt.attr: authority/secret.key
     133        echo "unique_subject = no" > $@
     134endif
    115135
    116136# SoftHSM tokens. Note that the SoftHSM 2 token is a directory and
     
    168188# port for MSVA in test cases that use it
    169189MSVA_PORT ?= 9933
     190# port for OCSP server (Apache vhost if enabled)
     191if ENABLE_OCSP_TEST
     192OCSP_PORT ?= 9936
     193endif
    170194# maximum time to wait for MSVA startup (milliseconds)
    171195TEST_MSVA_MAX_WAIT ?= 10000
     
    193217endif
    194218
     219if ENABLE_OCSP_TEST
     220AM_TESTS_ENVIRONMENT += export OPENSSL="@OPENSSL@"; \
     221        export OCSP_PORT="$(OCSP_PORT)";
     222endif
     223
    195224if ENABLE_NETNS
    196225AM_TESTS_ENVIRONMENT += export UNSHARE="@UNSHARE@"; \
  • test/client.template.in

    rc6cfe6e r9e309ae  
    55signing_key
    66encryption_key
     7### ocsp_uri=http://__HOSTNAME__:__OCSP_PORT__/ocsp/
  • test/server.template.in

    rc6cfe6e r9e309ae  
    55encryption_key
    66dns_name="__HOSTNAME__"
     7### ocsp_uri=http://__HOSTNAME__:__OCSP_PORT__/ocsp/
  • test/test_ca.mk

    rc6cfe6e r9e309ae  
    99%.template: $(srcdir)/%.template.in
    1010        sed s/__HOSTNAME__/$(TEST_HOST)/ < $< > $@
     11        if test -n "$(OCSP_PORT)"; then \
     12                sed -i -e 's/^### ocsp/ocsp/' \
     13                        -e s/__OCSP_PORT__/$(OCSP_PORT)/ $@; \
     14        fi
    1115
    1216%.uid: $(srcdir)/%.uid.in
Note: See TracChangeset for help on using the changeset viewer.