Changeset 0fcba60 in mod_gnutls for src/gnutls_hooks.c


Ignore:
Timestamp:
Dec 17, 2018, 1:05:51 PM (22 months ago)
Author:
Fiona Klute <fiona.klute@…>
Branches:
debian/master, master, proxy-ticket
Children:
68b5156
Parents:
f674424
git-author:
Fiona Klute <fiona.klute@…> (12/17/18 13:02:43)
git-committer:
Fiona Klute <fiona.klute@…> (12/17/18 13:05:51)
Message:

Move compiled default priorities to gnutls_util.[hc]

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gnutls_hooks.c

    rf674424 r0fcba60  
    5858
    5959
    60 /** Default GnuTLS priority string for mod_gnutls */
    61 #define MGS_DEFAULT_PRIORITY "NORMAL"
    62 /** Compiled version of MGS_DEFAULT_PRIORITY (initialized in the
    63  * pre_config hook) */
    64 static gnutls_priority_t default_prio;
    65 
    6660
    6761static int mgs_cert_verify(request_rec * r, mgs_handle_t * ctxt);
     
    8882
    8983    /* Deinit default priority setting */
    90     gnutls_priority_deinit(default_prio);
     84    mgs_default_priority_deinit();
    9185    return APR_SUCCESS;
    9286}
     
    143137
    144138    /* Initialize default priority setting */
    145     ret = gnutls_priority_init(&default_prio, MGS_DEFAULT_PRIORITY, NULL);
     139    ret = mgs_default_priority_init();
    146140    if (ret < 0)
    147141    {
     
    731725                         s->server_hostname, s->addrs->host_port,
    732726                         MGS_DEFAULT_PRIORITY);
    733             sc->priorities = default_prio;
     727            sc->priorities = mgs_get_default_prio();
    734728        }
    735729
     
    11811175
    11821176    /* Set Default Priority */
    1183         err = gnutls_priority_set(ctxt->session, default_prio);
     1177        err = gnutls_priority_set(ctxt->session, mgs_get_default_prio());
    11841178    if (err != GNUTLS_E_SUCCESS)
    11851179        ap_log_cerror(APLOG_MARK, APLOG_ERR, err, c,
     
    22322226                     s->server_hostname, s->addrs->host_port,
    22332227                     MGS_DEFAULT_PRIORITY);
    2234         sc->proxy_priorities = default_prio;
     2228        sc->proxy_priorities = mgs_get_default_prio();
    22352229    }
    22362230    else
Note: See TracChangeset for help on using the changeset viewer.