Changeset 8df5b25 in mod_gnutls for src


Ignore:
Timestamp:
Jan 11, 2013, 12:56:26 AM (9 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, upstream
Children:
15ffe0b, 9d9b093
Parents:
dc1e7e6
Message:

Imported Upstream version 0.4.3

Location:
src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • src/Makefile.in

    rdc1e7e6 r8df5b25  
    8383ACLOCAL = @ACLOCAL@
    8484AMTAR = @AMTAR@
     85APR_CFLAGS = @APR_CFLAGS@
     86APR_CPPFLAGS = @APR_CPPFLAGS@
    8587APR_INCLUDES = @APR_INCLUDES@
     88APR_LDFLAGS = @APR_LDFLAGS@
     89APR_LIBS = @APR_LIBS@
     90APR_LIBTOOL = @APR_LIBTOOL@
    8691APR_MEMCACHE_CFLAGS = @APR_MEMCACHE_CFLAGS@
    8792APR_MEMCACHE_LIBS = @APR_MEMCACHE_LIBS@
    8893APU_INCLUDES = @APU_INCLUDES@
     94APU_LDFLAGS = @APU_LDFLAGS@
     95APU_LIBS = @APU_LIBS@
     96APU_LIBTOOL = @APU_LIBTOOL@
    8997APXS_BIN = @APXS_BIN@
    9098APXS_CFLAGS = @APXS_CFLAGS@
     
    126134F77 = @F77@
    127135FFLAGS = @FFLAGS@
    128 GNUTLS_CERTTOOL = @GNUTLS_CERTTOOL@
    129136GREP = @GREP@
    130 GTLS_BIN = @GTLS_BIN@
    131137INSTALL = @INSTALL@
    132138INSTALL_DATA = @INSTALL_DATA@
     
    135141INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    136142LDFLAGS = @LDFLAGS@
     143LIBGNUTLS_CERTTOOL = @LIBGNUTLS_CERTTOOL@
    137144LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
     145LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
    138146LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
    139147LIBGNUTLS_PREFIX = @LIBGNUTLS_PREFIX@
  • src/gnutls_cache.c

    rdc1e7e6 r8df5b25  
    11/**
    22 *  Copyright 2004-2005 Paul Querna
     3 *  Portions Copyright 2008 Nikos Mavrogiannopoulos
    34 *
    45 *  Licensed under the Apache License, Version 2.0 (the "License");
     
    346347                }
    347348            }
     349            apr_dbm_freedatum( dbm, dbmval);
    348350           
    349351        }
     
    402404
    403405    if (dbmval.dptr == NULL || dbmval.dsize <= sizeof(apr_time_t)) {
     406        apr_dbm_freedatum( dbm, dbmval);
    404407        apr_dbm_close(dbm);
    405408        return data;
    406409    }
    407     apr_dbm_close(dbm);
    408410
    409411    data.size = dbmval.dsize - sizeof(apr_time_t);
     
    411413    data.data = gnutls_malloc(data.size);
    412414    if (data.data == NULL) {
     415        apr_dbm_freedatum( dbm, dbmval);
     416        apr_dbm_close(dbm);
    413417        return data;
    414418    }
    415419   
    416420    memcpy(data.data, dbmval.dptr+sizeof(apr_time_t), data.size);
     421
     422    apr_dbm_freedatum( dbm, dbmval);
     423    apr_dbm_close(dbm);
    417424
    418425    return data;
     
    460467   
    461468    if (rv != APR_SUCCESS) {
    462         ap_log_error(APLOG_MARK, APLOG_NOTICE, rv,
     469        ap_log_error(APLOG_MARK, APLOG_DEBUG, rv,
    463470                     ctxt->c->base_server,
    464471                     "[gnutls_cache] error storing in cache '%s'",
  • src/gnutls_config.c

    rdc1e7e6 r8df5b25  
    203203}
    204204
     205#ifdef ENABLE_SRP
     206
    205207const char *mgs_set_srp_tpasswd_file(cmd_parms * parms, void *dummy,
    206208                                     const char *arg)
     
    228230    return NULL;
    229231}
     232
     233#endif
    230234
    231235const char *mgs_set_cache(cmd_parms * parms, void *dummy,
     
    427431    }
    428432
     433#ifdef ENABLE_SRP
    429434    ret = gnutls_srp_allocate_server_credentials(&sc->srp_creds);
    430435    if (ret < 0) {
     
    435440    sc->srp_tpasswd_conf_file = NULL;
    436441    sc->srp_tpasswd_file = NULL;
     442#endif
     443
    437444    sc->privkey_x509 = NULL;
    438445    memset( sc->certs_x509, 0, sizeof(sc->certs_x509));
  • src/gnutls_hooks.c

    rdc1e7e6 r8df5b25  
    116116    gnutls_credentials_set(session, GNUTLS_CRD_ANON, ctxt->sc->anon_creds);
    117117
     118#ifdef ENABLE_SRP
    118119    if (ctxt->sc->srp_tpasswd_conf_file != NULL
    119120        && ctxt->sc->srp_tpasswd_file != NULL) {
     
    121122                               ctxt->sc->srp_creds);
    122123    }
     124#endif
    123125
    124126    /* update the priorities - to avoid negotiating a ciphersuite that is not
     
    314316                                                            cert_retrieve_fn);
    315317
     318#ifdef ENABLE_SRP
    316319            if (sc->srp_tpasswd_conf_file != NULL
    317320                && sc->srp_tpasswd_file != NULL) {
     
    330333                }
    331334            }
     335#endif
    332336
    333337            if (sc->certs_x509[0] == NULL
     
    663667                                               (ctxt->session)));
    664668
     669#ifdef ENABLE_SRP
    665670    apr_table_setn(env, "SSL_SRP_USER",
    666671                   gnutls_srp_server_get_username(ctxt->session));
     672#endif
    667673
    668674    if (apr_table_get(env, "SSL_CLIENT_VERIFY") == NULL)
     
    795801    apr_table_setn(env,
    796802       apr_pstrcat(r->pool, MGS_SIDE, "_CERT_TYPE", NULL), "X.509");
    797 #ifdef COMPAT
    798     apr_table_setn(env,
    799        apr_pstrcat(r->pool, MGS_SIDE, "_S_TYPE", NULL), "X.509");
    800 #endif
    801803
    802804    tmp =
  • src/mod_gnutls.c

    rdc1e7e6 r8df5b25  
    1717
    1818#include "mod_gnutls.h"
    19 
    2019
    2120static void gnutls_hooks(apr_pool_t * p)
     
    8180                  RSRC_CONF,
    8281                  "SSL Server SRP Password file"),
     82#ifdef ENABLE_SRP
    8383    AP_INIT_TAKE1("GnuTLSSRPPasswdFile", mgs_set_srp_tpasswd_file,
    8484                  NULL,
     
    8989                  RSRC_CONF,
    9090                  "SSL Server SRP Parameters file"),
     91#endif
    9192    AP_INIT_TAKE1("GnuTLSCacheTimeout", mgs_set_cache_timeout,
    9293                  NULL,
Note: See TracChangeset for help on using the changeset viewer.