Changeset 40ac29f in mod_gnutls for src/mod_gnutls.c


Ignore:
Timestamp:
Jan 11, 2013, 12:55:32 AM (7 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports
Children:
9a9f943
Parents:
3f5c713 (diff), ec06980 (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:

Merge tag 'upstream/0.4.0'

Upstream version 0.4.0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/mod_gnutls.c

    r3f5c713 r40ac29f  
    9797                  RSRC_CONF,
    9898                  "Cache Configuration"),
    99     AP_INIT_RAW_ARGS("GnuTLSCiphers", mgs_set_ciphers,
     99    AP_INIT_RAW_ARGS("GnuTLSPriorities", mgs_set_priorities,
    100100                  NULL,
    101101                  RSRC_CONF,
    102                   "The ciphers to enable (AES-128, 3DES, ARCFOUR-128, ARCFOUR-40)"),
    103     AP_INIT_RAW_ARGS("GnuTLSKeyExchangeAlgorithms", mgs_set_kx,
    104                   NULL,
    105                   RSRC_CONF,
    106                   "The key exchange algorithms to enable (RSA, DHE-RSA, DHE-DSS, RSA-EXPORT, SRP, SRP-RSA, SRP-DSS)"),
    107     AP_INIT_RAW_ARGS("GnuTLSMACAlgorithms", mgs_set_mac,
    108                   NULL,
    109                   RSRC_CONF,
    110                   "The MAC algorithms to utilize (SHA-1, MD5)"),
    111     AP_INIT_RAW_ARGS("GnuTLSCompressionMethods", mgs_set_compression,
    112                   NULL,
    113                   RSRC_CONF,
    114                   "The compression methods to utilize (NULL, ZLIB)"),
    115     AP_INIT_RAW_ARGS("GnuTLSProtocols", mgs_set_protocols,
    116                   NULL,
    117                   RSRC_CONF,
    118                   "The TLS protocol version to use (TLS1.1, TLS1.0, SSL3.0)"),
     102                  "The priorities to enable (ciphers, Key exchange, macs, compression)"),
    119103    AP_INIT_TAKE1("GnuTLSEnable", mgs_set_enabled,
    120104                  NULL,
Note: See TracChangeset for help on using the changeset viewer.