Changeset 787dab7 in mod_gnutls for src


Ignore:
Timestamp:
Feb 20, 2008, 2:50:09 PM (12 years ago)
Author:
Nokis Mavrogiannopoulos <nmav@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, msva, upstream
Children:
572096b
Parents:
2cdc264
git-author:
Nikos Mavrogiannopoulos <nmav@…> (02/20/08 14:50:09)
git-committer:
Nokis Mavrogiannopoulos <nmav@…> (02/20/08 14:50:09)
Message:

added option to disable srp (for distributions that disable it in gnutls)

Location:
src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/gnutls_config.c

    r2cdc264 r787dab7  
    282282
    283283
     284#ifdef ENABLE_SRP
     285
    284286const char *mgs_set_srp_tpasswd_file(cmd_parms * parms, void *dummy,
    285287                                     const char *arg)
     
    307309    return NULL;
    308310}
     311
     312#endif
    309313
    310314const char *mgs_set_cache(cmd_parms * parms, void *dummy,
     
    544548    }
    545549
     550#ifdef ENABLE_SRP
    546551    ret = gnutls_srp_allocate_server_credentials(&sc->srp_creds);
    547552    if (ret < 0) {
     
    552557    sc->srp_tpasswd_conf_file = NULL;
    553558    sc->srp_tpasswd_file = NULL;
     559#endif
     560
    554561    sc->privkey_x509 = NULL;
    555562    memset( sc->certs_x509, 0, sizeof(sc->certs_x509));
  • src/gnutls_hooks.c

    r2cdc264 r787dab7  
    132132    gnutls_credentials_set(session, GNUTLS_CRD_ANON, ctxt->sc->anon_creds);
    133133
     134#ifdef ENABLE_SRP
    134135    if (ctxt->sc->srp_tpasswd_conf_file != NULL
    135136        && ctxt->sc->srp_tpasswd_file != NULL) {
     
    137138                               ctxt->sc->srp_creds);
    138139    }
     140#endif
    139141
    140142    /* update the priorities - to avoid negotiating a ciphersuite that is not
     
    380382                                                            cert_retrieve_fn);
    381383
     384#ifdef ENABLE_SRP
    382385            if (sc->srp_tpasswd_conf_file != NULL
    383386                && sc->srp_tpasswd_file != NULL) {
     
    396399                }
    397400            }
     401#endif
    398402
    399403            if (sc->certs_x509[0] == NULL
     
    723727                                               (ctxt->session)));
    724728
     729#ifdef ENABLE_SRP
    725730    apr_table_setn(env, "SSL_SRP_USER",
    726731                   gnutls_srp_server_get_username(ctxt->session));
     732#endif
    727733
    728734    if (apr_table_get(env, "SSL_CLIENT_VERIFY") == NULL)
  • src/mod_gnutls.c

    r2cdc264 r787dab7  
    105105                  RSRC_CONF,
    106106                  "SSL Server PGP Private key file"),
     107#ifdef ENABLE_SRP
    107108    AP_INIT_TAKE1("GnuTLSSRPPasswdFile", mgs_set_srp_tpasswd_file,
    108109                  NULL,
     
    113114                  RSRC_CONF,
    114115                  "SSL Server SRP Parameters file"),
     116#endif
    115117    AP_INIT_TAKE1("GnuTLSCacheTimeout", mgs_set_cache_timeout,
    116118                  NULL,
Note: See TracChangeset for help on using the changeset viewer.