Changeset 7921dc7 in mod_gnutls for include/mod_gnutls.h.in


Ignore:
Timestamp:
Apr 22, 2018, 1:04:41 PM (2 years ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
debian/master, master, proxy-ticket
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
  • include/mod_gnutls.h.in

    r2246a84 r7921dc7  
    3333#include <gnutls/gnutls.h>
    3434#include <gnutls/abstract.h>
    35 #include <gnutls/openpgp.h>
    3635#include <gnutls/x509.h>
    3736
     
    123122    char *x509_key_file;
    124123    char *x509_ca_file;
    125 
    126     char *pgp_cert_file;
    127     char *pgp_key_file;
    128     char *pgp_ring_file;
    129124
    130125    char *dh_file;
     
    179174    gnutls_privkey_t privkey_x509;
    180175
    181         /* OpenPGP Certificate */
    182     gnutls_pcert_st *cert_pgp;
    183     gnutls_openpgp_crt_t *cert_crt_pgp;
    184 
    185         /* OpenPGP Certificate Private Key */
    186     gnutls_privkey_t privkey_pgp;
    187 #if GNUTLS_VERSION_NUMBER < 0x030312
    188     /* Internal structure for the OpenPGP private key, used in the
    189      * workaround for a bug in gnutls_privkey_import_openpgp_raw that
    190      * frees memory that is still needed. DO NOT USE for any other
    191      * purpose. */
    192     gnutls_openpgp_privkey_t privkey_pgp_internal;
    193 #endif
    194 
    195176    /* Export full certificates to CGI environment: */
    196177    int export_certificates_size;
     
    201182        /* A list of CA Certificates */
    202183    gnutls_x509_crt_t *ca_list;
    203         /* OpenPGP Key Ring */
    204     gnutls_openpgp_keyring_t pgp_list;
    205184        /* CA Certificate list size */
    206185    unsigned int ca_list_size;
     
    413392                             const char *arg);
    414393
    415 const char *mgs_set_pgpcert_file(cmd_parms * parms, void *dummy,
    416                                         const char *arg);
    417 
    418 const char *mgs_set_pgpkey_file(cmd_parms * parms, void *dummy,
    419                              const char *arg);
    420 
    421394const char *mgs_set_cache(cmd_parms * parms, void *dummy,
    422395                          const char *type, const char* arg);
     
    440413
    441414const char *mgs_set_srk_pin(cmd_parms * parms, void *dummy,
    442                                    const char *arg);
    443 
    444 const char *mgs_set_keyring_file(cmd_parms * parms, void *dummy,
    445415                                   const char *arg);
    446416
Note: See TracChangeset for help on using the changeset viewer.