Changeset 89f863f in mod_gnutls for src/mod_gnutls.c


Ignore:
Timestamp:
Oct 19, 2015, 9:07:40 PM (5 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, upstream
Children:
02c8e54, 24c6c16
Parents:
4addf74 (diff), 71cac80 (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:

Imported Upstream version 0.7.1

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/mod_gnutls.c

    r4addf74 r89f863f  
    137137
    138138static const command_rec mgs_config_cmds[] = {
    139     AP_INIT_TAKE1("GnuTLSProxyEngine", mgs_set_proxy_engine,
     139    AP_INIT_FLAG("GnuTLSProxyEngine", mgs_set_proxy_engine,
    140140    NULL,
    141141    RSRC_CONF | OR_AUTHCFG,
    142     "Enable SSL Proxy Engine"),
     142    "Enable TLS Proxy Engine"),
    143143    AP_INIT_TAKE1("GnuTLSP11Module", mgs_set_p11_module,
    144144    NULL,
    145145    RSRC_CONF,
    146     "Load this additional PKCS #11 provider library"),
     146    "Load this specific PKCS #11 provider library"),
    147147    AP_INIT_RAW_ARGS("GnuTLSPIN", mgs_set_pin,
    148148    NULL,
     
    180180    NULL,
    181181    RSRC_CONF,
    182     "SSL Server X509 Certificate file"),
     182    "TLS Server X509 Certificate file"),
    183183    AP_INIT_TAKE1("GnuTLSKeyFile", mgs_set_key_file,
    184184    NULL,
    185185    RSRC_CONF,
    186     "SSL Server X509 Private Key file"),
     186    "TLS Server X509 Private Key file"),
    187187    AP_INIT_TAKE1("GnuTLSX509CertificateFile", mgs_set_cert_file,
    188188    NULL,
    189189    RSRC_CONF,
    190     "SSL Server X509 Certificate file"),
     190    "TLS Server X509 Certificate file"),
    191191    AP_INIT_TAKE1("GnuTLSX509KeyFile", mgs_set_key_file,
    192192    NULL,
    193193    RSRC_CONF,
    194     "SSL Server X509 Private Key file"),
     194    "TLS Server X509 Private Key file"),
    195195    AP_INIT_TAKE1("GnuTLSPGPCertificateFile", mgs_set_pgpcert_file,
    196196    NULL,
    197197    RSRC_CONF,
    198     "SSL Server PGP Certificate file"),
     198    "TLS Server PGP Certificate file"),
    199199    AP_INIT_TAKE1("GnuTLSPGPKeyFile", mgs_set_pgpkey_file,
    200200    NULL,
    201201    RSRC_CONF,
    202     "SSL Server PGP Private key file"),
     202    "TLS Server PGP Private key file"),
    203203#ifdef ENABLE_SRP
    204204    AP_INIT_TAKE1("GnuTLSSRPPasswdFile", mgs_set_srp_tpasswd_file,
    205205    NULL,
    206206    RSRC_CONF,
    207     "SSL Server SRP Password Conf file"),
     207    "TLS Server SRP Password Conf file"),
    208208    AP_INIT_TAKE1("GnuTLSSRPPasswdConfFile",
    209209    mgs_set_srp_tpasswd_conf_file,
    210210    NULL,
    211211    RSRC_CONF,
    212     "SSL Server SRP Parameters file"),
     212    "TLS Server SRP Parameters file"),
    213213#endif
    214214    AP_INIT_TAKE1("GnuTLSCacheTimeout", mgs_set_cache_timeout,
     
    220220    RSRC_CONF,
    221221    "Cache Configuration"),
    222     AP_INIT_TAKE1("GnuTLSSessionTickets", mgs_set_tickets,
     222    AP_INIT_FLAG("GnuTLSSessionTickets", mgs_set_tickets,
    223223    NULL,
    224224    RSRC_CONF,
     
    228228    RSRC_CONF,
    229229    "The priorities to enable (ciphers, Key exchange, macs, compression)."),
    230     AP_INIT_TAKE1("GnuTLSEnable", mgs_set_enabled,
     230    AP_INIT_FLAG("GnuTLSEnable", mgs_set_enabled,
    231231    NULL,
    232232    RSRC_CONF,
Note: See TracChangeset for help on using the changeset viewer.