Last-Modified: Sat, 31 Jan 2026 18:51:46 GMT Expires: Tue, 29 Jan 2036 18:51:46 GMT mod_gnutls - mod_gnutls
aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gnutls_config.c14
-rw-r--r--src/gnutls_hooks.c10
2 files changed, 10 insertions, 14 deletions
diff --git a/src/gnutls_config.c b/src/gnutls_config.c
index 7b5a42b..8d6308a 100644
--- a/src/gnutls_config.c
+++ b/src/gnutls_config.c
@@ -151,15 +151,10 @@ const char *mgs_set_cert_file(cmd_parms * parms, void *dummy,
151 "Certificate '%s'", file); 151 "Certificate '%s'", file);
152 } 152 }
153 153
154 ret = gnutls_x509_crt_init(&sc->cert_x509); 154 sc->certs_x509_num = MAX_CHAIN_SIZE;
155 if (ret < 0) {
156 return apr_psprintf(parms->pool, "GnuTLS: Failed to initialize"
2005-04-24
* - remove more debug logging.Gravatar Paul Querna 2005-04-22
* client auth is sort of working.Gravatar Paul Querna 2005-04-22
* working SNI. Not so working Client Cert support.Gravatar Paul Querna 2005-04-21
* include support for 2.0.xxGravatar Paul Querna 2005-04-08
* wrap the debug log in maintainer mode.Gravatar Paul Querna 2005-04-08
* - remove anno credsGravatar Paul Querna 2005-04-06
* checkpoint the work so far. The DBM cache needs a little more work.Gravatar Paul Querna 2005-04-05
* - make memcahe optionalGravatar Paul Querna 2005-04-04
* use apr to parse hostnames..Gravatar Paul Querna 2004-12-12
* working support for a ssl session cache via memcached.Gravatar Paul Querna 2004-12-10
* add check for apr_memcacheGravatar Paul Querna 2004-12-09
* fixes and stuff that i should of already committed.Gravatar Paul Querna 2004-12-09
* re-order the cipher types.Gravatar Paul Querna 2004-12-06
* setting proper ignores.Gravatar Paul Querna 2004-12-02
* adding autofoo for memcache supportGravatar Paul Querna 2004-12-02
* hey hey, this is working code!Gravatar Paul Querna 2004-12-02
* input and output filtersGravatar Paul Querna 2004-09-28
* rename structures.Gravatar Paul Querna 2004-09-27
* break up the IO functions into their own fileGravatar Paul Querna 2004-09-27
* commit before i move everything aroundGravatar Paul Querna 2004-09-27
* updatedGravatar Paul Querna 2004-09-27
* iniail makefiles and license fooGravatar Paul Querna 2004-09-27
class='lineno'>152 ret->deinit_all = 0; 153 153 154 ret->cert.x509 = &ctxt->sc->cert_x509; 154 ret->cert.x509 = ctxt->sc->certs_x509; 155 ret->key.x509 = ctxt->sc->privkey_x509; 155 ret->key.x509 = ctxt->sc->privkey_x509; 156 return 0; 156 return 0; 157} 157}@@ -334,7 +334,7 @@ mgs_hook_post_config(apr_pool_t * p, apr_pool_t * plog, 334 } 334 } 335 } 335 } 336 336 337 if (sc->cert_x509 == NULL 337 if (sc->certs_x509[0] == NULL 338 && sc->enabled == GNUTLS_ENABLED_TRUE) { 338 && sc->enabled == GNUTLS_ENABLED_TRUE) { 339 ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, 339 ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, 340 "[GnuTLS] - Host '%s:%d' is missing a " 340 "[GnuTLS] - Host '%s:%d' is missing a "@@ -353,7 +353,7 @@ mgs_hook_post_config(apr_pool_t * p, apr_pool_t * plog, 353 } 353 } 354 354 355 if (sc->enabled == GNUTLS_ENABLED_TRUE) { 355 if (sc->enabled == GNUTLS_ENABLED_TRUE) { 356 rv = read_crt_cn(s, p, sc->cert_x509, &sc->cert_cn); 356 rv = read_crt_cn(s, p, sc->certs_x509[0], &sc->cert_cn); 357 if (rv < 0) { 357 if (rv < 0) { 358 ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, 358 ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, 359 "[GnuTLS] - Cannot find a certificate for host '%s:%d'!", 359 "[GnuTLS] - Cannot find a certificate for host '%s:%d'!",@@ -686,7 +686,7 @@ int mgs_hook_fixups(request_rec * r) 686 tmp = mgs_session_id2sz(sbuf, len, buf, sizeof(buf)); 686 tmp = mgs_session_id2sz(sbuf, len, buf, sizeof(buf)); 687 apr_table_setn(env, "SSL_SESSION_ID", apr_pstrdup(r->pool, tmp)); 687 apr_table_setn(env, "SSL_SESSION_ID", apr_pstrdup(r->pool, tmp)); 688 688 689 mgs_add_common_cert_vars(r, ctxt->sc->cert_x509, 0, 689 mgs_add_common_cert_vars(r, ctxt->sc->certs_x509[0], 0, 690 ctxt->sc->export_certificates_enabled); 690 ctxt->sc->export_certificates_enabled); 691 691 692 return rv; 692 return rv;