Changeset a26d3f6 in mod_gnutls

Timestamp:

Nov 6, 2018, 1:55:59 AM (2 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master

Children:

79fc46b

Parents:

4963516

git-author:

Fiona Klute <fiona.klute@…> (11/06/18 01:53:43)

git-committer:

Fiona Klute <fiona.klute@…> (11/06/18 01:55:59)

Message:

Protect early_sni_hook() against being called in the wrong context

File:

• src/gnutls_hooks.c (modified) (1 diff)

src/gnutls_hooks.c

@@ -1016 +1016 @@
                           const gnutls_datum_t *msg)
 {
-    //assert(htype == GNUTLS_HANDSHAKE_CLIENT_HELLO);
-    //assert(when == GNUTLS_HOOK_PRE);
     if (!incoming)
         return 0;
 
     mgs_handle_t *ctxt = (mgs_handle_t *) gnutls_session_get_ptr(session);
+
+    /* This is a hook for pre client hello ONLY! */
+    if (htype != GNUTLS_HANDSHAKE_CLIENT_HELLO || when != GNUTLS_HOOK_PRE)
+    {
+        ap_log_cerror(APLOG_MARK, APLOG_ERR, APR_EINVAL, ctxt->c,
+                      "%s called outside pre client hello hook, this "
+                      "indicates a programming error!",
+                      __func__);
+        return GNUTLS_E_SELF_TEST_ERROR;
+    }
+
     ap_log_cerror(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, ctxt->c,
                   "%s: Trying early SNI.",