aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--include/mod_gnutls.h.in3
-rw-r--r--src/gnutls_config.c16
-rw-r--r--src/gnutls_hooks.c2
-rw-r--r--src/mod_gnutls.c4
5 files changed, 26 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index d7bb44f..d5b68b6 100644
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,8 @@
8- Added support for session tickets. This allows a 8- Added support for session tickets. This allows a
9 server to avoid using a session cache and still support 9 server to avoid using a session cache and still support
10 session resumption. This is at the cost of transporting 10 session resumption. This is at the cost of transporting
11 session data during handshake. 11 session data during handshake. New option
12 GnuTLSSessionTickets [on|off]
12 13
13- Depend on gnutls 2.10.0 to force support for safe 2005-04-25
* apr_table_setn doesn't copy the data. oops.Gravatar Paul Querna 2005-04-24
* We already have a Certificate, use it directly. With SNI, GnuTLS doesn't pro...Gravatar Paul Querna 2005-04-24
* if there aren't any certs.. still set something.Gravatar Paul Querna 2005-04-24
* add SSL_SERVER_S_DN and SSL_SERVER_I_DN Gravatar Paul Querna 2005-04-24
* - move hooks to gnutls_hooks.cGravatar Paul Querna 2005-04-24
* move config functions to their own file. Gravatar Paul Querna 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
ef='/httpd/mod_gnutls/tree/src/gnutls_config.c?id=36c02797b672ed5ed937c798bd97aeeb7394f038#n300'>300 301 return NULL; 302} 303 288 304 289#ifdef ENABLE_SRP 305#ifdef ENABLE_SRP 290 306
diff --git a/src/gnutls_hooks.c b/src/gnutls_hooks.c
index 2130cb0..032e6f3 100644
--- a/src/gnutls_hooks.c
+++ b/src/gnutls_hooks.c
@@ -673,7 +673,7 @@ static mgs_handle_t *create_gnutls_handle(apr_pool_t * pool, conn_rec * c) 673 ctxt->output_length = 0; 673 ctxt->output_length = 0; 674 674 675 gnutls_init(&ctxt->session, GNUTLS_SERVER); 675 gnutls_init(&ctxt->session, GNUTLS_SERVER); 676 if (session_ticket_key.data != NULL) 676 if (session_ticket_key.data != NULL && ctxt->sc->tickets != 0) 677 gnutls_session_ticket_enable_server(ctxt->session, &session_ticket_key); 677 gnutls_session_ticket_enable_server(ctxt->session, &session_ticket_key); 678 678 679 /* because we don't set any default priorities here (we set later at 679 /* because we don't set any default priorities here (we set later at
diff --git a/src/mod_gnutls.c b/src/mod_gnutls.c
index 08e7dba..c95d183 100644
--- a/src/mod_gnutls.c
+++ b/src/mod_gnutls.c
@@ -121,6 +121,10 @@ static const command_rec mgs_config_cmds[] = { 121 NULL, 121 NULL, 122 RSRC_CONF, 122 RSRC_CONF, 123 "Cache Configuration"), 123 "Cache Configuration"), 124 AP_INIT_TAKE1("GnuTLSSessionTickets", mgs_set_tickets, 125 NULL, 126 RSRC_CONF, 127 "Session Tickets Configuration"), 124 AP_INIT_RAW_ARGS("GnuTLSPriorities", mgs_set_priorities, 128 AP_INIT_RAW_ARGS("GnuTLSPriorities", mgs_set_priorities, 125 NULL, 129 NULL, 126 RSRC_CONF, 130 RSRC_CONF,