- Timestamp:
- May 17, 2005, 5:00:53 PM (18 years ago)
- Branches:
- asyncio, debian/master, debian/stretch-backports, jessie-backports, master, msva, proxy-ticket, upstream
- Children:
- 836c2f9
- Parents:
- 836417f
- Location:
- src
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
src/Makefile.am
r836417f r84cb5b2 1 1 CLEANFILES = .libs/libmod_gnutls *~ 2 2 3 libmod_gnutls_la_SOURCES = mod_gnutls.c gnutls_io.c gnutls_cache.c gnutls_config.c gnutls_hooks.c 4 libmod_gnutls_la_CFLAGS = -Wall ${MODULE_CFLAGS} 5 libmod_gnutls_la_LDFLAGS = -rpath ${AP_LIBEXECDIR} -module -avoid-version ${MODULE_LIBS} 3 libmod_gnutls_la_SOURCES = mod_gnutls.c gnutls_io.c gnutls_cache.c gnutls_config.c gnutls_hooks.c gnutls_lua.c 4 libmod_gnutls_la_CFLAGS = -Wall ${MODULE_CFLAGS} ${LUA_CFLAGS} 5 libmod_gnutls_la_LDFLAGS = -rpath ${AP_LIBEXECDIR} -module -avoid-version ${MODULE_LIBS} ${LUA_LIBS} 6 6 7 7 lib_LTLIBRARIES = libmod_gnutls.la -
src/gnutls_config.c
r836417f r84cb5b2 318 318 } 319 319 320 void *mgs_config_dir_merge(apr_pool_t *p, void *basev, void *addv) 321 { 322 mgs_dirconf_rec *new; 323 mgs_dirconf_rec *base = (mgs_dirconf_rec *) basev; 324 mgs_dirconf_rec *add = (mgs_dirconf_rec *) addv; 325 326 new = (mgs_dirconf_rec *) apr_pcalloc(p, sizeof(mgs_dirconf_rec)); 327 new->lua_bytecode = apr_pstrmemdup(p, add->lua_bytecode, 328 add->lua_bytecode_len); 329 new->lua_bytecode_len = add->lua_bytecode_len; 330 new->client_verify_mode = add->client_verify_mode; 331 return new; 332 } 333 320 334 void *mgs_config_dir_create(apr_pool_t *p, char *dir) 321 335 { … … 323 337 324 338 dc->client_verify_mode = -1; 325 339 dc->lua_bytecode = NULL; 340 dc->lua_bytecode_len = 0; 326 341 return dc; 327 342 } -
src/gnutls_hooks.c
r836417f r84cb5b2 18 18 #include "mod_gnutls.h" 19 19 #include "http_vhost.h" 20 #include "ap_mpm.h" 20 21 21 22 #if !USING_2_1_RECENT … … 31 32 #endif 32 33 34 static int mpm_is_threaded; 35 33 36 static apr_status_t mgs_cleanup_pre_config(void *data) 34 37 { … … 49 52 50 53 #if APR_HAS_THREADS 51 /* TODO: Check MPM Type here */ 52 gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); 54 ap_mpm_query(AP_MPMQ_IS_THREADED, &mpm_is_threaded); 55 if (mpm_is_threaded) { 56 gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); 57 } 58 #else 59 mpm_is_threaded = 0; 53 60 #endif 54 61 … … 235 242 GNUTLS_OID_X520_COMMON_NAME, 0, 0, 236 243 sc->cert_cn, &data_len); 237 ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,238 s,239 "GnuTLS: sni-x509 cn: %s/%d pk: %s s: 0x%08X sc: 0x%08X", sc->cert_cn, rv,240 gnutls_pk_algorithm_get_name(gnutls_x509_privkey_get_pk_algorithm(sc->privkey_x509)),241 (unsigned int)s, (unsigned int)sc);242 244 } 243 245 } … … 569 571 apr_table_setn(env, "SSL_SERVER_I_DN", apr_pstrmemdup(r->pool, buf, len)); 570 572 } 571 572 573 return rv; 573 574 } … … 586 587 return DECLINED; 587 588 } 588 589 if (!dc) { 590 dc = mgs_config_dir_create(r->pool, NULL); 591 } 592 589 ap_add_common_vars(r); 590 mgs_hook_fixups(r); 591 status = mgs_authz_lua(r); 592 if (status != 0) { 593 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 594 "GnuTLS: FAILED Lua Authorization Test"); 595 return HTTP_FORBIDDEN; 596 } 593 597 if (dc->client_verify_mode == GNUTLS_CERT_IGNORE) { 594 598 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, -
src/mod_gnutls.c
r836417f r84cb5b2 55 55 } 56 56 57 58 57 static const command_rec mgs_config_cmds[] = { 59 58 AP_INIT_TAKE1("GnuTLSClientVerify", mgs_set_client_verify, … … 82 81 "Cache Configuration"), 83 82 AP_INIT_TAKE1("GnuTLSEnable", mgs_set_enabled, 84 NULL, RSRC_CONF, 83 NULL, 84 RSRC_CONF, 85 85 "Whether this server has GnuTLS Enabled. Default: Off"), 86 86 AP_INIT_RAW_ARGS("<GnuTLSRequire", mgs_set_require_section, 87 NULL, 88 EXEC_ON_READ|OR_ALL, 89 "Whether this server has GnuTLS Enabled. Default: Off"), 90 AP_INIT_RAW_ARGS("GnuTLSRequireByteCode", mgs_set_require_bytecode, 91 NULL, 92 OR_ALL, 93 "Internal Command for reading Lua Bytecode."), 87 94 {NULL} 88 95 }; … … 91 98 STANDARD20_MODULE_STUFF, 92 99 mgs_config_dir_create, 93 NULL,100 mgs_config_dir_merge, 94 101 mgs_config_server_create, 95 102 NULL,
Note: See TracChangeset
for help on using the changeset viewer.