aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/mod_gnutls.h.in14
1 files changed, 14 insertions, 0 deletions
diff --git a/include/mod_gnutls.h.in b/include/mod_gnutls.h.in
index a0f6581..db7e7dd 100644
--- a/include/mod_gnutls.h.in
+++ b/include/mod_gnutls.h.in
@@ -29,6 +29,8 @@
29 29
30#include <gcrypt.h> 30#include <gcrypt.h>
31#include <gnutls/gnutls.h> 31#include <gnutls/gnutls.h>
32#include <gnutls/extra.h>
33#include <gnutls/openpgp.h>
32#include <gnutls/x509.h> 34#include <gnutls/x509.h>
33 35
34#ifndef __mod_gnutls_h_inc 36#ifndef __mod_gnutls_h_inc
@@ -94,6 +96,8 @@ typedef struct
94 gnutls_x509_crt_t certs_x509[MAX_CHAIN_SIZE]; /* A certificate chain */ 96 gnutls_x509_crt_t certs_x509[MAX_CHAIN_SIZE]; /* A certificate chain */
95 unsigned int certs_x509_num; 97 unsigned int certs_x509_num;
96 gnutls_x509_privkey_t privkey_x509; 98 gnutls_x509_privkey_t privkey_x509;
99 gnutls_openpgp_crt_t cert_pgp; /* A certificate chain */
100 gnutls_openpgp_privkey_t privkey_pgp;
97 int enabled; 101 int enabled;
98 /* whether to send the PEM encoded certificates 102 /* whether to send the PEM encoded certificates
99 * to CGIs 103 * to CGIs
@@ -108,6 +112,7 @@ typedef struct
108 const char* srp_tpasswd_file; 112 const char* srp_tpasswd_file;
109 const char* srp_tpasswd_conf_file; 113 const char* srp_tpasswd_conf_file;
110 gnutls_x509_crt_t ca_list[MAX_CA_CRTS]; 114 gnutls_x509_crt_t ca_list[MAX_CA_CRTS];
115 gnutls_openpgp_keyring_t pgp_list;
111 unsigned int ca_list_size; 116 unsigned int ca_list_size;
112 int client_verify_mode; 117 int client_verify_mode;
113} mgs_srvconf_rec; 118} mgs_srvconf_rec;
@@ -254,6 +259,12 @@ const char *mgs_set_cert_file(cmd_parms * parms, void *dummy,
254const char *mgs_set_key_file(cmd_parms * parms, void *dummy, 259const char *mgs_set_key_file(cmd_parms * parms, void *dummy,
255 const char *arg); 260 const char *arg);
256 261
262const char *mgs_set_pgpcert_file(cmd_parms * parms, void *dummy,
263 const char *arg);
264
265const char *mgs_set_pgpkey_file(cmd_parms * parms, void *dummy,
266 const char *arg);
267
257const char *mgs_set_cache(cmd_parms * parms, void *dummy, 268const char *mgs_set_cache(cmd_parms * parms, void *dummy,
258 const char *type, const char* arg); 269 const char *type, const char* arg);
259 270
@@ -266,6 +277,9 @@ const char *mgs_set_client_verify(cmd_parms * parms, void *dummy,
266const char *mgs_set_client_ca_file(cmd_parms * parms, void *dummy, 277const char *mgs_set_client_ca_file(cmd_parms * parms, void *dummy,
267 const char *arg); 278 const char *arg);
268 279
280const char *mgs_set_keyring_file(cmd_parms * parms, void *dummy,
281 const char *arg);
282
269const char *mgs_set_enabled(cmd_parms * parms, void *dummy, 283const char *mgs_set_enabled(cmd_parms * parms, void *dummy,
270 const char *arg); 284 const char *arg);
271const char *mgs_set_export_certificates_enabled(cmd_parms * parms, void *dummy, 285const char *mgs_set_export_certificates_enabled(cmd_parms * parms, void *dummy,