Changeset 7921dc7 in mod_gnutls for include

Timestamp:

Apr 22, 2018, 1:04:41 PM (5 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, debian/master, main, 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:

• include/mod_gnutls.h.in (modified) (6 diffs)

include/mod_gnutls.h.in

@@ -33 +33 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/abstract.h>
-#include <gnutls/openpgp.h>
 #include <gnutls/x509.h>
 
@@ -123 +122 @@
     char *x509_key_file;
     char *x509_ca_file;
-
-    char *pgp_cert_file;
-    char *pgp_key_file;
-    char *pgp_ring_file;
 
     char *dh_file;
@@ -179 +174 @@
     gnutls_privkey_t privkey_x509;
 
-        /* OpenPGP Certificate */
-    gnutls_pcert_st *cert_pgp;
-    gnutls_openpgp_crt_t *cert_crt_pgp;
-
-        /* OpenPGP Certificate Private Key */
-    gnutls_privkey_t privkey_pgp;
-#if GNUTLS_VERSION_NUMBER < 0x030312
-    /* Internal structure for the OpenPGP private key, used in the
-     * workaround for a bug in gnutls_privkey_import_openpgp_raw that
-     * frees memory that is still needed. DO NOT USE for any other
-     * purpose. */
-    gnutls_openpgp_privkey_t privkey_pgp_internal;
-#endif
-
     /* Export full certificates to CGI environment: */
     int export_certificates_size;
@@ -201 +182 @@
         /* A list of CA Certificates */
     gnutls_x509_crt_t *ca_list;
-        /* OpenPGP Key Ring */
-    gnutls_openpgp_keyring_t pgp_list;
         /* CA Certificate list size */
     unsigned int ca_list_size;
@@ -413 +392 @@
                              const char *arg);
 
-const char *mgs_set_pgpcert_file(cmd_parms * parms, void *dummy,
-                                        const char *arg);
-
-const char *mgs_set_pgpkey_file(cmd_parms * parms, void *dummy,
-                             const char *arg);
-
 const char *mgs_set_cache(cmd_parms * parms, void *dummy,
                           const char *type, const char* arg);
@@ -440 +413 @@
 
 const char *mgs_set_srk_pin(cmd_parms * parms, void *dummy,
-                                   const char *arg);
-
-const char *mgs_set_keyring_file(cmd_parms * parms, void *dummy,
                                    const char *arg);