summaryrefslogtreecommitdiffstatsabout
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/mod_gnutls.h.in35
1 files changed, 19 insertions, 16 deletions
diff --git a/include/mod_gnutls.h.in b/include/mod_gnutls.h.in
index 469e678..f9ff32b 100644
--- a/include/mod_gnutls.h.in
+++ b/include/mod_gnutls.h.in
@@ -1,5 +1,5 @@
1/* ==================================================================== 1/**
2 * Copyright 2004 Paul Querna 2 * Copyright 2004-2005 Paul Querna
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -42,21 +42,14 @@ module AP_MODULE_DECLARE_DATA gnutls_module;
42#define GNUTLS_ENABLED_FALSE 0 42#define GNUTLS_ENABLED_FALSE 0
43#define GNUTLS_ENABLED_TRUE 1 43#define GNUTLS_ENABLED_TRUE 1
44 44
45 45typedef enum
46/** 46{
47 * GnuTLS changed the names of several structures between 1.0.X and 1.1.X 47 mod_gnutls_cache_none,
48 * This is just a simple hack so we can compile with both versions. 48 mod_gnutls_cache_dbm,
49 * There is a full list in <gnutls/compat.h>, But I am just 49#if HAVE_APR_MEMCACHE
50 * doing this for a few types we use. 50 mod_gnutls_cache_memcache
51 */
52#ifndef gnutls_certificate_credentials_t
53#define gnutls_certificate_credentials_t gnutls_certificate_credentials
54#define gnutls_anon_server_credentials_t gnutls_anon_server_credentials
55#define gnutls_session_t gnutls_session
56#define gnutls_transport_ptr_t gnutls_transport_ptr
57#define gnutls_dh_params_t gnutls_dh_params
58#define gnutls_rsa_params_t gnutls_rsa_params
59#endif 51#endif
52} mod_gnutls_cache_e;
60 53
61typedef struct 54typedef struct
62{ 55{
@@ -70,7 +63,12 @@ typedef struct
70 int macs[16]; 63 int macs[16];
71 int protocol[16]; 64 int protocol[16];
72 int compression[16]; 65 int compression[16];
66 int cert_types[16];
67 apr_time_t cache_timeout;
68 mod_gnutls_cache_e cache_type;
73 const char* cache_config; 69 const char* cache_config;
70 const char* rsa_params_file;
71 const char* dh_params_file;
74} mod_gnutls_srvconf_rec; 72} mod_gnutls_srvconf_rec;
75 73
76typedef struct { 74typedef struct {
@@ -159,6 +157,11 @@ ssize_t mod_gnutls_transport_write(gnutls_transport_ptr_t ptr,
159 157
160 158
161/** 159/**
160 * Init the Cache after Configuration is done
161 */
162int mod_gnutls_cache_post_config(apr_pool_t *p, server_rec *s,
163 mod_gnutls_srvconf_rec *sc);
164/**
162 * Init the Cache inside each Process 165 * Init the Cache inside each Process
163 */ 166 */
164int mod_gnutls_cache_child_init(apr_pool_t *p, server_rec *s, 167int mod_gnutls_cache_child_init(apr_pool_t *p, server_rec *s,