Changeset 2db6923 in mod_gnutls


Ignore:
Timestamp:
Aug 22, 2015, 3:52:52 PM (4 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports
Children:
71e9a5c
Parents:
8ed8e96
Message:

refresh patches with gbp pq

Location:
debian/patches
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • debian/patches/enable-tls-per-connection.patch

    r8ed8e96 r2db6923  
    1 From e8acf058857eae21cde2fca0f4e97338075f5f60 Mon Sep 17 00:00:00 2001
    21From: Thomas Klute <thomas2.klute@uni-dortmund.de>
    32Date: Tue, 20 Jan 2015 16:30:36 +0100
    4 Subject: [PATCH] Enable/disable TLS per connection in ssl_engine_disable
     3Subject: Enable/disable TLS per connection in ssl_engine_disable
    54
    65Previously, ssl_engine_disable set the server wide variable sc->enabled
     
    1918 3 files changed, 53 insertions(+), 22 deletions(-)
    2019
    21 Index: mod-gnutls-0.6/include/mod_gnutls.h.in
    22 ===================================================================
    23 --- mod-gnutls-0.6.orig/include/mod_gnutls.h.in
    24 +++ mod-gnutls-0.6/include/mod_gnutls.h.in
     20diff --git a/include/mod_gnutls.h.in b/include/mod_gnutls.h.in
     21index 57aa52e..eba4cb2 100644
     22--- a/include/mod_gnutls.h.in
     23+++ b/include/mod_gnutls.h.in
    2524@@ -170,6 +170,8 @@ typedef struct {
    2625     mgs_srvconf_rec *sc;
     
    3231     gnutls_session_t session;
    3332        /* module input status */
    34 Index: mod-gnutls-0.6/src/gnutls_hooks.c
    35 ===================================================================
    36 --- mod-gnutls-0.6.orig/src/gnutls_hooks.c
    37 +++ mod-gnutls-0.6/src/gnutls_hooks.c
    38 @@ -674,14 +674,23 @@ mgs_srvconf_rec *mgs_find_sni_server(gnu
     33diff --git a/src/gnutls_hooks.c b/src/gnutls_hooks.c
     34index e6e7a67..9ba4ca1 100644
     35--- a/src/gnutls_hooks.c
     36+++ b/src/gnutls_hooks.c
     37@@ -674,14 +674,23 @@ mgs_srvconf_rec *mgs_find_sni_server(gnutls_session_t session) {
    3938     return NULL;
    4039 }
     
    6665     ctxt->sc = sc;
    6766     ctxt->status = 0;
    68 @@ -692,6 +701,7 @@ static void create_gnutls_handle(conn_re
     67@@ -692,6 +701,7 @@ static void create_gnutls_handle(conn_rec * c) {
    6968     ctxt->output_bb = apr_brigade_create(c->pool, c->bucket_alloc);
    7069     ctxt->output_blen = 0;
     
    7473     gnutls_init(&ctxt->session, GNUTLS_SERVER);
    7574     /* Initialize Session Tickets */
    76 @@ -707,8 +717,6 @@ static void create_gnutls_handle(conn_re
     75@@ -707,8 +717,6 @@ static void create_gnutls_handle(conn_rec * c) {
    7776     /* Initialize Session Cache */
    7877     mgs_cache_session_init(ctxt);
     
    8382     gnutls_transport_set_pull_function(ctxt->session,
    8483             mgs_transport_read);
    85 @@ -722,15 +730,20 @@ static void create_gnutls_handle(conn_re
     84@@ -722,15 +730,20 @@ static void create_gnutls_handle(conn_rec * c) {
    8685             ctxt, NULL, c);
    8786 }
     
    9695-    sc = (mgs_srvconf_rec *) ap_get_module_config(c->base_server->module_config,
    9796-            &gnutls_module);
    98 -
    99 -    if (sc && (!sc->enabled || sc->proxy_enabled == GNUTLS_ENABLED_TRUE)) {
    10097+    mgs_srvconf_rec *sc = (mgs_srvconf_rec *)
    10198+        ap_get_module_config(c->base_server->module_config, &gnutls_module);
    10299+    mgs_handle_t *ctxt = (mgs_handle_t *)
    103100+        ap_get_module_config(c->conn_config, &gnutls_module);
    104 +
     101 
     102-    if (sc && (!sc->enabled || sc->proxy_enabled == GNUTLS_ENABLED_TRUE)) {
    105103+    if ((sc && (!sc->enabled || sc->proxy_enabled == GNUTLS_ENABLED_TRUE))
    106104+        || (ctxt && ctxt->enabled == GNUTLS_ENABLED_FALSE))
     
    128126     }
    129127 
    130 Index: mod-gnutls-0.6/src/mod_gnutls.c
    131 ===================================================================
    132 --- mod-gnutls-0.6.orig/src/mod_gnutls.c
    133 +++ mod-gnutls-0.6/src/mod_gnutls.c
     128diff --git a/src/mod_gnutls.c b/src/mod_gnutls.c
     129index 0a32ffd..e974ae8 100644
     130--- a/src/mod_gnutls.c
     131+++ b/src/mod_gnutls.c
    134132@@ -19,8 +19,12 @@
    135133 
  • debian/patches/fix-tls-client-auth.patch

    r8ed8e96 r2db6923  
    1 From 5a8a32bbfb8a83fe6358c5c31c443325a7775fc2 Mon Sep 17 00:00:00 2001
    21From: Thomas Klute <thomas2.klute@uni-dortmund.de>
    32Date: Thu, 5 Feb 2015 14:48:45 +0100
    4 Subject: [PATCH] TLS Client auth: Check server verify mode if unset for dir
     3Subject: TLS Client auth: Check server verify mode if unset for dir
    54
    65The authentication hook (mgs_hook_authz) failed to consider the server's
     
    2322 1 file changed, 6 insertions(+), 3 deletions(-)
    2423
    25 Index: mod-gnutls-0.6/src/gnutls_hooks.c
    26 ===================================================================
    27 --- mod-gnutls-0.6.orig/src/gnutls_hooks.c
    28 +++ mod-gnutls-0.6/src/gnutls_hooks.c
     24diff --git a/src/gnutls_hooks.c b/src/gnutls_hooks.c
     25index 1c2e094..e6e7a67 100644
     26--- a/src/gnutls_hooks.c
     27+++ b/src/gnutls_hooks.c
    2928@@ -871,9 +871,12 @@ int mgs_hook_authz(request_rec * r) {
    3029             return DECLINED;
  • debian/patches/no-deinit-on-proxy-disable.patch

    r8ed8e96 r2db6923  
    1 From c782c1f12c0ed4d5048eb52fd3ef51037c53f426 Mon Sep 17 00:00:00 2001
    21From: Thomas Klute <thomas2.klute@uni-dortmund.de>
    32Date: Wed, 21 Jan 2015 09:41:51 +0100
    4 Subject: [PATCH] Don't do global deinit when disabling TLS for a proxy back
    5  end connection
     3Subject: Don't do global deinit when disabling TLS for a proxy back end
     4 connection
    65
    76Prior to this commit, ssl_engine_disable called mgs_cleanup_pre_config
     
    2928
    3029diff --git a/src/mod_gnutls.c b/src/mod_gnutls.c
    31 index a77364d..2d0e6ea 100644
     30index e974ae8..760445f 100644
    3231--- a/src/mod_gnutls.c
    3332+++ b/src/mod_gnutls.c
     
    4140 }
    4241 
    43 --
    44 2.1.4
    45 
  • debian/patches/proxy-segfault-fix.patch

    r8ed8e96 r2db6923  
    1 From 3d361b8e5d7c4c971d344658728979fe978dc759 Mon Sep 17 00:00:00 2001
    21From: Thomas Klute <thomas2.klute@uni-dortmund.de>
    32Date: Tue, 13 Jan 2015 17:04:38 +0100
    4 Subject: [PATCH] Check if filters exist before removing them in
    5  ssl_engine_disable
     3Subject: Check if filters exist before removing them in ssl_engine_disable
    64
    75Trying to remove filters that are NULL leads to a segfault in the worker
     
    1412 1 file changed, 4 insertions(+), 2 deletions(-)
    1513
     14diff --git a/src/mod_gnutls.c b/src/mod_gnutls.c
     15index e576fb8..0a32ffd 100644
    1616--- a/src/mod_gnutls.c
    1717+++ b/src/mod_gnutls.c
    18 @@ -80,8 +80,10 @@
     18@@ -80,8 +80,10 @@ int ssl_engine_disable(conn_rec *c) {
    1919     if(sc->enabled == GNUTLS_ENABLED_FALSE) {
    2020         return 1;
  • debian/patches/test-setup.patch

    r8ed8e96 r2db6923  
    11From: Jurica Stanojkovic <Jurica.Stanojkovic@imgtec.com>
    2 Subject: Re: FTBFS on many architectures, test suite errors
    32Date: Wed, 29 Oct 2014 13:55:56 +0000
     3Subject: FTBFS on many architectures, test suite errors
    44
    55https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750857
     
    77Use ip6-loopback for TEST_IP and increment the timeout values so the tests
    88won't fail on slow build machines.
     9---
     10 t/Makefile | 6 +++---
     11 1 file changed, 3 insertions(+), 3 deletions(-)
    912
    10 Index: mod-gnutls-0.6/t/Makefile
    11 ===================================================================
    12 --- mod-gnutls-0.6.orig/t/Makefile
    13 +++ mod-gnutls-0.6/t/Makefile
     13diff --git a/t/Makefile b/t/Makefile
     14index c7e7e2c..4c39bac 100644
     15--- a/t/Makefile
     16+++ b/t/Makefile
    1417@@ -6,13 +6,13 @@
    1518 # simple configuration choices.
Note: See TracChangeset for help on using the changeset viewer.