Changeset 787dab7 in mod_gnutls for src

Timestamp:

Feb 20, 2008, 2:50:09 PM (15 years ago)

Author:

Nokis Mavrogiannopoulos <nmav@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, main, master, msva, proxy-ticket, 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:

• gnutls_config.c (modified) (4 diffs)
• gnutls_hooks.c (modified) (5 diffs)
• mod_gnutls.c (modified) (2 diffs)

src/gnutls_config.c

@@ -282 +282 @@
 
 
+#ifdef ENABLE_SRP
+
 const char *mgs_set_srp_tpasswd_file(cmd_parms * parms, void *dummy,
                                      const char *arg)
@@ -307 +309 @@
     return NULL;
 }
+
+#endif
 
 const char *mgs_set_cache(cmd_parms * parms, void *dummy,
@@ -544 +548 @@
     }
 
+#ifdef ENABLE_SRP
     ret = gnutls_srp_allocate_server_credentials(&sc->srp_creds);
     if (ret < 0) {
@@ -552 +557 @@
     sc->srp_tpasswd_conf_file = NULL;
     sc->srp_tpasswd_file = NULL;
+#endif
+
     sc->privkey_x509 = NULL;
     memset( sc->certs_x509, 0, sizeof(sc->certs_x509));

src/gnutls_hooks.c

@@ -132 +132 @@
     gnutls_credentials_set(session, GNUTLS_CRD_ANON, ctxt->sc->anon_creds);
 
+#ifdef ENABLE_SRP
     if (ctxt->sc->srp_tpasswd_conf_file != NULL
         && ctxt->sc->srp_tpasswd_file != NULL) {
@@ -137 +138 @@
                                ctxt->sc->srp_creds);
     }
+#endif
 
     /* update the priorities - to avoid negotiating a ciphersuite that is not
@@ -380 +382 @@
                                                             cert_retrieve_fn);
 
+#ifdef ENABLE_SRP
             if (sc->srp_tpasswd_conf_file != NULL
                 && sc->srp_tpasswd_file != NULL) {
@@ -396 +399 @@
                 }
             }
+#endif
 
             if (sc->certs_x509[0] == NULL
@@ -723 +727 @@
                                                (ctxt->session)));
 
+#ifdef ENABLE_SRP
     apr_table_setn(env, "SSL_SRP_USER",
                    gnutls_srp_server_get_username(ctxt->session));
+#endif
 
     if (apr_table_get(env, "SSL_CLIENT_VERIFY") == NULL)

src/mod_gnutls.c

@@ -105 +105 @@
                   RSRC_CONF,
                   "SSL Server PGP Private key file"),
+#ifdef ENABLE_SRP
     AP_INIT_TAKE1("GnuTLSSRPPasswdFile", mgs_set_srp_tpasswd_file,
                   NULL,
@@ -113 +114 @@
                   RSRC_CONF,
                   "SSL Server SRP Parameters file"),
+#endif
     AP_INIT_TAKE1("GnuTLSCacheTimeout", mgs_set_cache_timeout,
                   NULL,