Changeset 7921dc7 in mod_gnutls for src/mod_gnutls.c


Ignore:
Timestamp:
Apr 22, 2018, 1:04:41 PM (19 months ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
debian/master, master
Children:
0470e44
Parents:
2246a84
git-author:
Fiona Klute <fiona.klute@…> (04/18/18 04:38:36)
git-committer:
Fiona Klute <fiona.klute@…> (04/22/18 13:04:41)
Message:

Remove OpenPGP authentication

OpenPGP authentication was removed from GnuTLS a while ago, follow suit.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/mod_gnutls.c

    r2246a84 r7921dc7  
    245245}
    246246
     247#define OPENPGP_REMOVED "OpenPGP support has been removed."
     248
    247249static const command_rec mgs_config_cmds[] = {
    248250    AP_INIT_FLAG("GnuTLSProxyEngine", mgs_set_proxy_engine,
     
    278280    RSRC_CONF,
    279281    "Set the CA File to verify Client Certificates"),
    280     AP_INIT_TAKE1("GnuTLSPGPKeyringFile", mgs_set_keyring_file,
    281     NULL,
    282     RSRC_CONF,
    283     "Set the Keyring File to verify Client Certificates"),
    284282    AP_INIT_TAKE1("GnuTLSDHFile", mgs_set_dh_file,
    285283    NULL,
     
    302300    RSRC_CONF,
    303301    "TLS Server X509 Private Key file"),
    304     AP_INIT_TAKE1("GnuTLSPGPCertificateFile", mgs_set_pgpcert_file,
    305     NULL,
    306     RSRC_CONF,
    307     "TLS Server PGP Certificate file"),
    308     AP_INIT_TAKE1("GnuTLSPGPKeyFile", mgs_set_pgpkey_file,
    309     NULL,
    310     RSRC_CONF,
    311     "TLS Server PGP Private key file"),
    312302#ifdef ENABLE_SRP
    313303    AP_INIT_TAKE1("GnuTLSSRPPasswdFile", mgs_set_srp_tpasswd_file,
     
    396386                  NULL, RSRC_CONF,
    397387                  "Socket timeout for OCSP requests"),
     388    AP_INIT_RAW_ARGS("GnuTLSPGPKeyringFile",
     389                     ap_set_deprecated, NULL, OR_ALL, OPENPGP_REMOVED),
     390    AP_INIT_RAW_ARGS("GnuTLSPGPCertificateFile",
     391                     ap_set_deprecated, NULL, OR_ALL, OPENPGP_REMOVED),
     392    AP_INIT_RAW_ARGS("GnuTLSPGPKeyFile",
     393                     ap_set_deprecated, NULL, OR_ALL, OPENPGP_REMOVED),
    398394#ifdef __clang__
    399395    /* Workaround for this clang bug:
Note: See TracChangeset for help on using the changeset viewer.