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