Changeset 9180a60 in mod_gnutls

Timestamp:

Sep 25, 2011, 9:15:02 PM (12 years ago)

Author:

Dash Shendy <neuromancer@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, main, master, msva, proxy-ticket, upstream

Children:

fb26be5

Parents:

84e07cc

Message:

Applied New Functions Patch from Nikos

File:

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

src/gnutls_hooks.c

@@ -22 +22 @@
 #include "ap_mpm.h"
 
-#if APR_HAS_THREADS
-#if GNUTLS_VERSION_MAJOR <= 2 && GNUTLS_VERSION_MINOR < 11
-#include <gcrypt.h>
-GCRY_THREAD_OPTION_PTHREAD_IMPL;
-#endif
-#endif
 
 #if !USING_2_1_RECENT
@@ -37 +31 @@
 #endif
 
-static int mpm_is_threaded;
 static gnutls_datum session_ticket_key = {NULL, 0};
 
@@ -87 +80 @@
 #endif
 
-#if APR_HAS_THREADS
-    ap_mpm_query(AP_MPMQ_IS_THREADED, &mpm_is_threaded);
-#if (GNUTLS_VERSION_MAJOR == 2 && GNUTLS_VERSION_MINOR < 11) || GNUTLS_VERSION_MAJOR < 2
-    if (mpm_is_threaded) {
-        gcry_control(GCRYCTL_SET_THREAD_CBS,
-                &gcry_threads_pthread);
-    }
-#endif
-#else
-    mpm_is_threaded = 0;
-#endif
-
-
     if (gnutls_check_version(LIBGNUTLS_VERSION) == NULL) {
         _gnutls_log(debug_log_fp,
@@ -131 +111 @@
     mgs_handle_t *ctxt;
     mgs_srvconf_rec *tsc;
-    int ret;
-    int cprio[2];
+    int ret = 0;
 
     _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__);
@@ -171 +150 @@
     ret = gnutls_priority_set(session, ctxt->sc->priorities);
     /* actually it shouldn't fail since we have checked at startup */
-    if (ret < 0)
-        return ret;
-
-    /* If both certificate types are not present disallow them from
-     * being negotiated.
-     */
-    if (ctxt->sc->certs_x509[0] != NULL && ctxt->sc->cert_pgp == NULL) {
-        cprio[0] = GNUTLS_CRT_X509;
-        cprio[1] = 0;
-        gnutls_certificate_type_set_priority(session, cprio);
-    } else if (ctxt->sc->cert_pgp != NULL
-            && ctxt->sc->certs_x509[0] == NULL) {
-        cprio[0] = GNUTLS_CRT_OPENPGP;
-        cprio[1] = 0;
-        gnutls_certificate_type_set_priority(session, cprio);
-    }
-
-    return 0;
+    return ret;
 }
 
@@ -201 +163 @@
 
     if (gnutls_certificate_type_get(session) == GNUTLS_CRT_X509) {
-        ret->type = GNUTLS_CRT_X509;
+        ret->cert_type = GNUTLS_CRT_X509;
+        ret->key_type = GNUTLS_PRIVKEY_X509;
         ret->ncerts = ctxt->sc->certs_x509_num;
         ret->deinit_all = 0;
@@ -209 +172 @@
 
         return 0;
-    } else if (gnutls_certificate_type_get(session) ==
-            GNUTLS_CRT_OPENPGP) {
-        ret->type = GNUTLS_CRT_OPENPGP;
+    } else if (gnutls_certificate_type_get(session) == GNUTLS_CRT_OPENPGP) {
+        ret->cert_type = GNUTLS_CRT_OPENPGP;
+        ret->key_type = GNUTLS_PRIVKEY_OPENPGP;        
         ret->ncerts = 1;
         ret->deinit_all = 0;
@@ -709 +672 @@
      * gnutls to be able to read packets.
      */
-    gnutls_protocol_set_priority(ctxt->session, protocol_priority);
+    gnutls_set_default_priority(ctxt->session);
 
     gnutls_handshake_set_post_client_hello_function(ctxt->session,