Changeset efc43b4 in mod_gnutls for src/gnutls_hooks.c


Ignore:
Timestamp:
Sep 25, 2018, 3:46:26 PM (2 years ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
debian/master, master, proxy-ticket
Children:
cb6476c
Parents:
994200a
Message:

Split per-vhost post config for OCSP stapling into configuring and enabling

This is preparation for enabling stapling by default: Configuration
failure may be ignored if stapling is not explicitly enabled by the
user (at the cost of not stapling).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gnutls_hooks.c

    r994200a refc43b4  
    659659            sc->client_verify_method = mgs_cvm_cartel;
    660660        if (sc->ocsp_staple == GNUTLS_ENABLED_UNSET)
     661            // TODO: Check result of mgs_ocsp_configure_stapling()
     662            // below instead, staple if possible.
    661663            sc->ocsp_staple = GNUTLS_ENABLED_FALSE;
    662664
     
    665667        if (sc->enabled && sc->ocsp_staple)
    666668        {
    667             rv = mgs_ocsp_post_config_server(pconf, ptemp, s);
     669            const char *err = mgs_ocsp_configure_stapling(pconf, ptemp, s);
     670            if (err != NULL)
     671            {
     672                ap_log_error(APLOG_MARK, APLOG_STARTUP, APR_EINVAL, s,
     673                             "OCSP stapling configuration failed for "
     674                             "host '%s:%d': %s",
     675                             s->server_hostname, s->addrs->host_port, err);
     676                return HTTP_INTERNAL_SERVER_ERROR;
     677            }
     678            rv = mgs_ocsp_enable_stapling(pconf, ptemp, s);
    668679            if (rv != OK && rv != DECLINED)
    669680                return rv;
Note: See TracChangeset for help on using the changeset viewer.