Changeset 8df5b25 in mod_gnutls for src/gnutls_hooks.c

Timestamp:

Jan 11, 2013, 12:56:26 AM (8 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

File:

• src/gnutls_hooks.c (modified) (6 diffs)

src/gnutls_hooks.c

@@ -116 +116 @@
     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) {
@@ -121 +122 @@
                                ctxt->sc->srp_creds);
     }
+#endif
 
     /* update the priorities - to avoid negotiating a ciphersuite that is not
@@ -314 +316 @@
                                                             cert_retrieve_fn);
 
+#ifdef ENABLE_SRP
             if (sc->srp_tpasswd_conf_file != NULL
                 && sc->srp_tpasswd_file != NULL) {
@@ -330 +333 @@
                 }
             }
+#endif
 
             if (sc->certs_x509[0] == NULL
@@ -663 +667 @@
                                                (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)
@@ -795 +801 @@
     apr_table_setn(env,
        apr_pstrcat(r->pool, MGS_SIDE, "_CERT_TYPE", NULL), "X.509");
-#ifdef COMPAT
-    apr_table_setn(env,
-       apr_pstrcat(r->pool, MGS_SIDE, "_S_TYPE", NULL), "X.509");
-#endif
 
     tmp =