Changeset 316bd8c in mod_gnutls


Ignore:
Timestamp:
Apr 21, 2005, 9:29:13 PM (14 years ago)
Author:
Paul Querna <chip@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, msva, upstream
Children:
46b85d8
Parents:
e924ddd
Message:
  • remove more debug logging.
  • fix a crash by changing the certificate structure *after* starting the handshake.
Location:
src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/gnutls_cache.c

    re924ddd r316bd8c  
    210210
    211211    if (rv != APR_SUCCESS) {
     212#if MOD_GNUTLS_DEBUG
    212213        ap_log_error(APLOG_MARK, APLOG_DEBUG, rv,
    213214                     ctxt->c->base_server,
    214215                     "[gnutls_cache] error fetching key '%s' ",
    215216                     strkey);
    216 
     217#endif
    217218        data.size = 0;
    218219        data.data = NULL;
  • src/gnutls_io.c

    re924ddd r316bd8c  
    382382            goto tryagain;
    383383        }
    384 
     384#if USING_2_1_RECENT
     385        ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, ctxt->c,
     386                     "GnuTLS: Handshake Failed (%d) '%s'", ret,
     387                      gnutls_strerror(ret));
     388#else
    385389        ap_log_error(APLOG_MARK, APLOG_ERR, 0, ctxt->c->base_server,
    386390                     "GnuTLS: Handshake Failed (%d) '%s'", ret,
    387                       gnutls_strerror(ret));
     391                     gnutls_strerror(ret));
     392#endif
    388393        ctxt->status = -1;
    389394        gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL,
  • src/mod_gnutls.c

    re924ddd r316bd8c  
    295295static void mod_gnutls_changed_servers(mod_gnutls_handle_t *ctxt)
    296296{
    297     gnutls_credentials_set(ctxt->session, GNUTLS_CRD_CERTIFICATE, ctxt->sc->certs);
    298297    gnutls_certificate_server_set_request(ctxt->session, ctxt->sc->client_verify_mode);
    299298}
     
    480479
    481480    mod_gnutls_cache_session_init(ctxt);
     481   
     482    gnutls_credentials_set(ctxt->session, GNUTLS_CRD_CERTIFICATE, ctxt->sc->certs);
    482483
    483484    gnutls_certificate_server_set_retrieve_function(sc->certs, cert_retrieve_fn);
    484 
     485   
    485486    mod_gnutls_changed_servers(ctxt);
    486487    return ctxt;
     
    839840    if (dc->client_verify_mode == GNUTLS_CERT_IGNORE) {
    840841        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
    841                       "GnuTLS: Ignoring Client Certificate!");
     842                      "GnuTLS: Directory set to Ignore Client Certificate!");
    842843        return DECLINED;
    843844    }
     
    856857    }
    857858    else if (ctxt->sc->client_verify_mode == GNUTLS_CERT_IGNORE) {
     859#if MOD_GNUTLS_DEBUG
    858860        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
    859861                      "GnuTLS: Peer is set to IGNORE");
     862#endif
    860863        return DECLINED;
    861864    }
Note: See TracChangeset for help on using the changeset viewer.