Changeset 07889ab in mod_gnutls

Timestamp:

Nov 16, 2013, 2:46:50 AM (9 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

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

Children:

5c0d491

Parents:

e3cbda4

git-author:

Daniel Kahn Gillmor <dkg@…> (01/30/13 06:29:49)

git-committer:

Daniel Kahn Gillmor <dkg@…> (11/16/13 02:46:50)

Message:

MSVA: some initial framework

File:

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

src/gnutls_hooks.c

@@ -22 +22 @@
 #include "ap_mpm.h"
 
+#ifdef ENABLE_MSVA
+#include <msv/msv.h>
+#endif
 
 #if !USING_2_1_RECENT
@@ -58 +61 @@
 #define _gnutls_log(...)
 #endif
+
+static const char* mgs_readable_cvm(mgs_client_verification_method_e m) {
+    switch(m) {
+    case mgs_cvm_unset:
+        return "unset";
+    case mgs_cvm_cartel:
+        return "cartel";
+    case mgs_cvm_msva:
+        return "msva";
+    }
+    return "unknown";
+}
 
 /* Pre-Configuration HOOK: Runs First */
@@ -1138 +1153 @@
             }
         }
-    } else if (gnutls_certificate_type_get(ctxt->session) ==
-            GNUTLS_CRT_OPENPGP) {
+    } else if (gnutls_certificate_type_get(ctxt->session) == GNUTLS_CRT_OPENPGP) {
         if (cert_list_size > 1) {
             ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,