Changeset 259e835 in mod_gnutls for src/gnutls_config.c


Ignore:
Timestamp:
Apr 4, 2015, 4:57:10 PM (5 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, upstream
Children:
c4a015b
Parents:
1d9cfaf (diff), c32240f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Thomas Klute <thomas2.klute@…> (04/04/15 16:54:45)
git-committer:
Thomas Klute <thomas2.klute@…> (04/04/15 16:57:10)
Message:

Merge branch 'master' into new-gnutls-api

Branch 'master' at this point represents the upstream mod_gnutls
repository. Merging that first should make it easier to merge with my
changes later.

The result compiles, but OpenPGP authentication does not work.

Resolved conflicts in:

src/gnutls_config.c
src/gnutls_hooks.c

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gnutls_config.c

    r1d9cfaf r259e835  
    2828#endif
    2929
    30 static int pin_callback(void *user, int attempt, const char *token_url,
    31                         const char *token_label, unsigned int flags,
    32                         char *pin, size_t pin_max)
     30static int pin_callback(void *user, int attempt __attribute__((unused)),
     31                        const char *token_url __attribute__((unused)),
     32                        const char *token_label, unsigned int flags,
     33                        char *pin, size_t pin_max)
    3334{
    3435    mgs_srvconf_rec *sc = user;
     
    174175            goto cleanup;
    175176        }
    176 
    177177
    178178        ret =
     
    574574
    575575const char *mgs_set_pgpcert_file(cmd_parms * parms, void *dummy __attribute__((unused)),
    576         const char *arg) {
     576        const char *arg)
     577{
    577578    mgs_srvconf_rec *sc =
    578579        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
     
    839840}
    840841
    841 const char *mgs_set_priorities(cmd_parms * parms, void *dummy __attribute__((unused)), const char *arg) {
    842 
     842const char *mgs_set_priorities(cmd_parms * parms, void *dummy __attribute__((unused)), const char *arg)
     843{
    843844    mgs_srvconf_rec *sc = (mgs_srvconf_rec *)
    844845        ap_get_module_config(parms->server->module_config, &gnutls_module);
     
    849850}
    850851
    851 const char *mgs_set_pin(cmd_parms * parms, void *dummy, const char *arg)
     852const char *mgs_set_pin(cmd_parms * parms, void *dummy __attribute__((unused)),
     853                        const char *arg)
    852854{
    853855
     
    860862}
    861863
    862 const char *mgs_set_srk_pin(cmd_parms * parms, void *dummy, const char *arg)
     864const char *mgs_set_srk_pin(cmd_parms * parms,
     865                            void *dummy __attribute__((unused)),
     866                            const char *arg)
    863867{
    864868
     
    872876
    873877static mgs_srvconf_rec *_mgs_config_server_create(apr_pool_t * p,
    874                                                   char **err)
     878                                                  char **err __attribute__((unused)))
    875879{
    876880    mgs_srvconf_rec *sc = apr_pcalloc(p, sizeof(*sc));
Note: See TracChangeset for help on using the changeset viewer.