Changeset 3e94bd3 in mod_gnutls for include/mod_gnutls.h.in
- Timestamp:
- Jan 11, 2013, 12:54:56 AM (8 years ago)
- Branches:
- debian/master, debian/stretch-backports, jessie-backports, upstream
- Children:
- 1c87791, 70c2d86
- Parents:
- 8eb6ccd
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
include/mod_gnutls.h.in
r8eb6ccd r3e94bd3 28 28 #include "ap_release.h" 29 29 30 #include <gcrypt.h> 31 #include <gnutls/gnutls.h> 32 #include <gnutls/x509.h> 33 30 34 #ifndef __mod_gnutls_h_inc 31 35 #define __mod_gnutls_h_inc 32 36 33 37 #define HAVE_APR_MEMCACHE @have_apr_memcache@ 34 35 #include <gcrypt.h>36 #include <gnutls/gnutls.h>37 38 38 39 module AP_MODULE_DECLARE_DATA gnutls_module; … … 62 63 typedef enum 63 64 { 64 m od_gnutls_cache_none,65 m od_gnutls_cache_dbm,65 mgs_cache_none, 66 mgs_cache_dbm, 66 67 #if HAVE_APR_MEMCACHE 67 m od_gnutls_cache_memcache68 mgs_cache_memcache 68 69 #endif 69 } m od_gnutls_cache_e;70 } mgs_cache_e; 70 71 71 72 typedef struct 72 73 { 74 int client_verify_mode; 75 } mgs_dirconf_rec; 76 77 typedef struct 78 { 73 79 gnutls_certificate_credentials_t certs; 74 char *key_file; 75 char *cert_file; 80 char* cert_cn; 81 gnutls_x509_crt_t cert_x509; 82 gnutls_x509_privkey_t privkey_x509; 76 83 int enabled; 77 84 int ciphers[16]; … … 82 89 int cert_types[16]; 83 90 apr_time_t cache_timeout; 84 m od_gnutls_cache_e cache_type;91 mgs_cache_e cache_type; 85 92 const char* cache_config; 86 93 const char* rsa_params_file; 87 94 const char* dh_params_file; 88 } mod_gnutls_srvconf_rec; 95 int client_verify_mode; 96 } mgs_srvconf_rec; 89 97 90 98 typedef struct { 91 99 int length; 92 100 char *value; 93 } m od_gnutls_char_buffer_t;101 } mgs_char_buffer_t; 94 102 95 103 typedef struct 96 104 { 97 m od_gnutls_srvconf_rec *sc;105 mgs_srvconf_rec *sc; 98 106 conn_rec* c; 99 107 gnutls_session_t session; … … 104 112 apr_read_type_e input_block; 105 113 ap_input_mode_t input_mode; 106 m od_gnutls_char_buffer_t input_cbuf;114 mgs_char_buffer_t input_cbuf; 107 115 char input_buffer[AP_IOBUFSIZE]; 108 116 … … 116 124 int status; 117 125 int non_https; 118 } m od_gnutls_handle_t;126 } mgs_handle_t; 119 127 120 128 /** Functions in gnutls_io.c **/ 121 129 122 130 /** 123 * m od_gnutls_filter_input will filter the input data131 * mgs_filter_input will filter the input data 124 132 * by decrypting it using GnuTLS and passes it cleartext. 125 133 * … … 130 138 * @return result status 131 139 */ 132 apr_status_t m od_gnutls_filter_input(ap_filter_t * f,140 apr_status_t mgs_filter_input(ap_filter_t * f, 133 141 apr_bucket_brigade * bb, 134 142 ap_input_mode_t mode, … … 137 145 138 146 /** 139 * m od_gnutls_filter_output will filter the encrypt147 * mgs_filter_output will filter the encrypt 140 148 * the incoming bucket using GnuTLS and passes it onto the next filter. 141 149 * … … 144 152 * @return result status 145 153 */ 146 apr_status_t m od_gnutls_filter_output(ap_filter_t * f,154 apr_status_t mgs_filter_output(ap_filter_t * f, 147 155 apr_bucket_brigade * bb); 148 156 149 157 150 158 /** 151 * m od_gnutls_transport_read is called from GnuTLS to provide encrypted159 * mgs_transport_read is called from GnuTLS to provide encrypted 152 160 * data from the client. 153 161 * … … 157 165 * @return size length of the data stored in buffer 158 166 */ 159 ssize_t m od_gnutls_transport_read(gnutls_transport_ptr_t ptr,167 ssize_t mgs_transport_read(gnutls_transport_ptr_t ptr, 160 168 void *buffer, size_t len); 161 169 162 170 /** 163 * m od_gnutls_transport_write is called from GnuTLS to171 * mgs_transport_write is called from GnuTLS to 164 172 * write data to the client. 165 173 * … … 169 177 * @return size length of the data written 170 178 */ 171 ssize_t m od_gnutls_transport_write(gnutls_transport_ptr_t ptr,179 ssize_t mgs_transport_write(gnutls_transport_ptr_t ptr, 172 180 const void *buffer, size_t len); 173 181 174 182 183 int mgs_rehandshake(mgs_handle_t * ctxt); 184 185 186 175 187 /** 176 188 * Init the Cache after Configuration is done 177 189 */ 178 int m od_gnutls_cache_post_config(apr_pool_t *p, server_rec *s,179 m od_gnutls_srvconf_rec *sc);190 int mgs_cache_post_config(apr_pool_t *p, server_rec *s, 191 mgs_srvconf_rec *sc); 180 192 /** 181 193 * Init the Cache inside each Process 182 194 */ 183 int m od_gnutls_cache_child_init(apr_pool_t *p, server_rec *s,184 m od_gnutls_srvconf_rec *sc);195 int mgs_cache_child_init(apr_pool_t *p, server_rec *s, 196 mgs_srvconf_rec *sc); 185 197 /** 186 198 * Setup the Session Caching 187 199 */ 188 int m od_gnutls_cache_session_init(mod_gnutls_handle_t *ctxt);200 int mgs_cache_session_init(mgs_handle_t *ctxt); 189 201 190 202 #define GNUTLS_SESSION_ID_STRING_LEN \ … … 198 210 * @param strsize The Maximum Length that can be stored in str 199 211 */ 200 char *m od_gnutls_session_id2sz(unsigned char *id, int idlen,212 char *mgs_session_id2sz(unsigned char *id, int idlen, 201 213 char *str, int strsize); 202 214 215 216 /* Configuration Functions */ 217 218 const char *mgs_set_cert_file(cmd_parms * parms, void *dummy, 219 const char *arg); 220 221 const char *mgs_set_key_file(cmd_parms * parms, void *dummy, 222 const char *arg); 223 224 const char *mgs_set_cache(cmd_parms * parms, void *dummy, 225 const char *type, const char* arg); 226 227 const char *mgs_set_cache_timeout(cmd_parms * parms, void *dummy, 228 const char *arg); 229 230 const char *mgs_set_client_verify(cmd_parms * parms, void *dummy, 231 const char *arg); 232 233 const char *mgs_set_client_ca_file(cmd_parms * parms, void *dummy, 234 const char *arg); 235 236 const char *mgs_set_enabled(cmd_parms * parms, void *dummy, 237 const char *arg); 238 239 void *mgs_config_server_create(apr_pool_t * p, server_rec * s); 240 241 void *mgs_config_dir_create(apr_pool_t *p, char *dir); 242 243 mgs_srvconf_rec* mgs_find_sni_server(gnutls_session_t session); 244 245 /* mod_gnutls Hooks. */ 246 247 int mgs_hook_pre_config(apr_pool_t * pconf, 248 apr_pool_t * plog, apr_pool_t * ptemp); 249 250 int mgs_hook_post_config(apr_pool_t * p, apr_pool_t * plog, 251 apr_pool_t * ptemp, 252 server_rec * base_server); 253 254 void mgs_hook_child_init(apr_pool_t *p, server_rec *s); 255 256 const char *mgs_hook_http_scheme(const request_rec * r); 257 258 apr_port_t mgs_hook_default_port(const request_rec * r); 259 260 int mgs_hook_pre_connection(conn_rec * c, void *csd); 261 262 int mgs_hook_fixups(request_rec *r); 263 264 int mgs_hook_authz(request_rec *r); 265 203 266 #endif /* __mod_gnutls_h_inc */
Note: See TracChangeset
for help on using the changeset viewer.