Changeset 7d1ab49 in mod_gnutls for src/gnutls_config.c


Ignore:
Timestamp:
Jan 29, 2013, 8:05:42 PM (7 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, msva, upstream
Children:
3e800f9
Parents:
6ef3afc
git-author:
Daniel Kahn Gillmor <dkg@…> (01/29/13 18:52:52)
git-committer:
Daniel Kahn Gillmor <dkg@…> (01/29/13 20:05:42)
Message:

restore GnuTLSExportCertificate directive

It looks to me like this option was mistakenly removed when the the
RSA-EXPORT configuration parameters were ripped out, possibly due to
confusion over the term Export.

GnuTLSExportCertificate is a useful configuration directive, and some
users might be relying on it.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gnutls_config.c

    r6ef3afc r7d1ab49  
    531531}
    532532
     533const char *mgs_set_export_certificates_enabled(cmd_parms * parms, void *dummy, const char *arg) {
     534    mgs_srvconf_rec *sc = (mgs_srvconf_rec *) ap_get_module_config(parms->server->module_config, &gnutls_module);
     535    if (!strcasecmp(arg, "On")) {
     536        sc->export_certificates_enabled = GNUTLS_ENABLED_TRUE;
     537    } else if (!strcasecmp(arg, "Off")) {
     538        sc->export_certificates_enabled = GNUTLS_ENABLED_FALSE;
     539    } else {
     540        return
     541        "GnuTLSExportCertificates must be set to 'On' or 'Off'";
     542    }
     543
     544    return NULL;
     545}
     546
    533547const char *mgs_set_priorities(cmd_parms * parms, void *dummy, const char *arg) {
    534548
     
    601615    sc->dh_params = NULL;
    602616    sc->proxy_enabled = GNUTLS_ENABLED_UNSET;
     617    sc->export_certificates_enabled = GNUTLS_ENABLED_UNSET;
    603618   
    604619/* this relies on GnuTLS never changing the gnutls_certificate_request_t enum to define -1 */
     
    628643    gnutls_srvconf_merge(tickets, GNUTLS_ENABLED_UNSET);
    629644    gnutls_srvconf_merge(proxy_enabled, GNUTLS_ENABLED_UNSET);
     645    gnutls_srvconf_merge(export_certificates_enabled, GNUTLS_ENABLED_UNSET);
    630646    gnutls_srvconf_merge(client_verify_mode, -1);
    631647    gnutls_srvconf_merge(srp_tpasswd_file, NULL);
Note: See TracChangeset for help on using the changeset viewer.