Changeset 7bebb42 in mod_gnutls for src

Timestamp:

Nov 28, 2007, 1:29:21 PM (15 years ago)

Author:

Nokis Mavrogiannopoulos <nmav@…>

Branches:

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

Children:

3e6bc31

Parents:

8e33f2d

git-author:

Nikos Mavrogiannopoulos <nmav@…> (11/28/07 13:29:21)

git-committer:

Nokis Mavrogiannopoulos <nmav@…> (11/28/07 13:29:21)

Message:

upgraded to 0.4.0

Location:

src

Files:

• Makefile.am (modified) (1 diff)
• gnutls_cache.c (modified) (5 diffs)
• gnutls_config.c (modified) (10 diffs)
• gnutls_hooks.c (modified) (22 diffs)
• gnutls_io.c (modified) (4 diffs)
• mod_gnutls.c (modified) (4 diffs)

src/Makefile.am

@@ -1 +1 @@
 CLEANFILES = .libs/libmod_gnutls *~
 
-libmod_gnutls_la_SOURCES = mod_gnutls.c gnutls_io.c gnutls_cache.c gnutls_config.c gnutls_hooks.c gnutls_lua.c
+libmod_gnutls_la_SOURCES = mod_gnutls.c gnutls_io.c gnutls_cache.c gnutls_config.c gnutls_hooks.c 
+#gnutls_lua.c
 libmod_gnutls_la_CFLAGS = -Wall ${MODULE_CFLAGS} ${LUA_CFLAGS}
 libmod_gnutls_la_LDFLAGS = -rpath ${AP_LIBEXECDIR} -module -avoid-version ${MODULE_LIBS} ${LUA_LIBS}

src/gnutls_cache.c

@@ -39 +39 @@
 #define STR_SESSION_LEN (GNUTLS_SESSION_ID_STRING_LEN + MC_TAG_LEN)
 
+#if 0
 static char *gnutls_session_id2sz(unsigned char *id, int idlen,
                                char *str, int strsize)
@@ -51 +52 @@
     }
     *cp = '\0';
+    return str;
+}
+#endif
+
+#define CTIME "%b %d %k:%M:%S %Y %Z"
+char *mgs_time2sz(time_t in_time, char *str, int strsize)
+{
+    apr_time_exp_t vtm;
+    apr_size_t ret_size;
+    apr_time_t t;
+    
+ 
+    apr_time_ansi_put (&t, in_time);
+    apr_time_exp_gmt (&vtm, t);
+    apr_strftime(str, &ret_size, strsize-1, CTIME, &vtm);
+
     return str;
 }
@@ -350 +367 @@
     apr_status_t rv;
 
-    dbmkey.dptr  = key.data;
+    dbmkey.dptr  = (void*)key.data;
     dbmkey.dsize = key.size;
-
-    dbm_cache_expire(ctxt);
 
     rv = apr_dbm_open(&dbm, ctxt->sc->cache_config,
@@ -413 +428 @@
            data.data, data.size);
 
+    /* we expire dbm only on every store
+     */
     dbm_cache_expire(ctxt);
 
@@ -455 +472 @@
     dbmkey.dsize = key.size;
 
-    dbm_cache_expire(ctxt);
-    
     rv = apr_dbm_open(&dbm, ctxt->sc->cache_config,
                       APR_DBM_RWCREATE, SSL_DBM_FILE_MODE, ctxt->c->pool);

src/gnutls_config.c

@@ -18 +18 @@
 #include "mod_gnutls.h"
 
-static int load_datum_from_file(apr_pool_t* pool, 
-                                const char* file,
-                                gnutls_datum_t* data)
-{
-    apr_file_t* fp;
+static int load_datum_from_file(apr_pool_t * pool,
+                                const char *file, gnutls_datum_t * data)
+{
+    apr_file_t *fp;
     apr_finfo_t finfo;
     apr_status_t rv;
     apr_size_t br = 0;
-    
-    rv = apr_file_open(&fp, file, APR_READ|APR_BINARY, APR_OS_DEFAULT, 
-                       pool);
+
+    rv = apr_file_open(&fp, file, APR_READ | APR_BINARY, APR_OS_DEFAULT,
+                       pool);
     if (rv != APR_SUCCESS) {
-        return rv;
-    }
-    
+        return rv;
+    }
+
     rv = apr_file_info_get(&finfo, APR_FINFO_SIZE, fp);
-    
+
     if (rv != APR_SUCCESS) {
-        return rv;
-    }
-    
-    data->data = apr_palloc(pool, finfo.size+1);
+        return rv;
+    }
+
+    data->data = apr_palloc(pool, finfo.size + 1);
     rv = apr_file_read_full(fp, data->data, finfo.size, &br);
-    
+
     if (rv != APR_SUCCESS) {
-        return rv;
+        return rv;
     }
     apr_file_close(fp);
-    
+
     data->data[br] = '\0';
     data->size = br;
-    
+
     return 0;
 }
 
+const char *mgs_set_dh_file(cmd_parms * parms, void *dummy,
+                            const char *arg)
+{
+    mgs_srvconf_rec *sc =
+        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
+                                                 module_config,
+                                                 &gnutls_module);
+
+    sc->dh_params_file = ap_server_root_relative(parms->pool, arg);
+
+    return NULL;
+}
+
+const char *mgs_set_rsa_export_file(cmd_parms * parms, void *dummy,
+                                    const char *arg)
+{
+    mgs_srvconf_rec *sc =
+        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
+                                                 module_config,
+                                                 &gnutls_module);
+
+    sc->rsa_params_file = ap_server_root_relative(parms->pool, arg);
+
+    return NULL;
+}
+
+
 const char *mgs_set_cert_file(cmd_parms * parms, void *dummy,
-                                        const char *arg)
+                              const char *arg)
 {
     int ret;
     gnutls_datum_t data;
-    const char* file;
-    apr_pool_t* spool;
-    mgs_srvconf_rec *sc =
-        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
-                                                        module_config,
-                                                        &gnutls_module);
+    const char *file;
+    apr_pool_t *spool;
+    mgs_srvconf_rec *sc =
+        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
+                                                 module_config,
+                                                 &gnutls_module);
     apr_pool_create(&spool, parms->pool);
-    
+
     file = ap_server_root_relative(spool, arg);
 
     if (load_datum_from_file(spool, file, &data) != 0) {
-        return apr_psprintf(parms->pool, "GnuTLS: Error Reading "
-                            "Certificate '%s'", file);
-    }
-    
+        return apr_psprintf(parms->pool, "GnuTLS: Error Reading "
+                            "Certificate '%s'", file);
+    }
+
     gnutls_x509_crt_init(&sc->cert_x509);
-    ret = gnutls_x509_crt_import(sc->cert_x509, &data, GNUTLS_X509_FMT_PEM);
+    ret =
+        gnutls_x509_crt_import(sc->cert_x509, &data, GNUTLS_X509_FMT_PEM);
     if (ret != 0) {
-        return apr_psprintf(parms->pool, "GnuTLS: Failed to Import "
-                            "Certificate'%s': (%d) %s", file, ret, 
-                            gnutls_strerror(ret));
-    }
-    
+        return apr_psprintf(parms->pool, "GnuTLS: Failed to Import "
+                            "Certificate'%s': (%d) %s", file, ret,
+                            gnutls_strerror(ret));
+    }
+
     apr_pool_destroy(spool);
     return NULL;
@@ -86 +113 @@
 
 const char *mgs_set_key_file(cmd_parms * parms, void *dummy,
-                                       const char *arg)
+                             const char *arg)
 {
     int ret;
     gnutls_datum_t data;
-    const char* file;
-    apr_pool_t* spool;
-    mgs_srvconf_rec *sc =
-        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
-                                                        module_config,
-                                                        &gnutls_module);
+    const char *file;
+    apr_pool_t *spool;
+    mgs_srvconf_rec *sc =
+        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
+                                                 module_config,
+                                                 &gnutls_module);
     apr_pool_create(&spool, parms->pool);
-    
+
     file = ap_server_root_relative(spool, arg);
-    
+
     if (load_datum_from_file(spool, file, &data) != 0) {
-        return apr_psprintf(parms->pool, "GnuTLS: Error Reading "
-                            "Private Key '%s'", file);
-    }
-    
+        return apr_psprintf(parms->pool, "GnuTLS: Error Reading "
+                            "Private Key '%s'", file);
+    }
+
     gnutls_x509_privkey_init(&sc->privkey_x509);
-    ret = gnutls_x509_privkey_import(sc->privkey_x509, &data, GNUTLS_X509_FMT_PEM);
+    ret =
+        gnutls_x509_privkey_import(sc->privkey_x509, &data,
+                                   GNUTLS_X509_FMT_PEM);
     if (ret != 0) {
-        return apr_psprintf(parms->pool, "GnuTLS: Failed to Import "
-                            "Private Key '%s': (%d) %s", file, ret, 
-                            gnutls_strerror(ret));
+        return apr_psprintf(parms->pool, "GnuTLS: Failed to Import "
+                            "Private Key '%s': (%d) %s", file, ret,
+                            gnutls_strerror(ret));
     }
     apr_pool_destroy(spool);
@@ -116 +145 @@
 }
 
+const char *mgs_set_srp_tpasswd_file(cmd_parms * parms, void *dummy,
+                                     const char *arg)
+{
+    mgs_srvconf_rec *sc =
+        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
+                                                 module_config,
+                                                 &gnutls_module);
+
+    sc->srp_tpasswd_file = ap_server_root_relative(parms->pool, arg);
+
+    return NULL;
+}
+
+const char *mgs_set_srp_tpasswd_conf_file(cmd_parms * parms, void *dummy,
+                                          const char *arg)
+{
+    mgs_srvconf_rec *sc =
+        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
+                                                 module_config,
+                                                 &gnutls_module);
+
+    sc->srp_tpasswd_conf_file = ap_server_root_relative(parms->pool, arg);
+
+    return NULL;
+}
+
 const char *mgs_set_cache(cmd_parms * parms, void *dummy,
-                                       const char *type, const char* arg)
-{
-    const char* err;
+                          const char *type, const char *arg)
+{
+    const char *err;
     mgs_srvconf_rec *sc = ap_get_module_config(parms->server->
-                                                        module_config,
-                                                        &gnutls_module);
+                                               module_config,
+                                               &gnutls_module);
     if ((err = ap_check_cmd_context(parms, GLOBAL_ONLY))) {
-        return err;
+        return err;
     }
 
     if (strcasecmp("none", type) == 0) {
-        sc->cache_type = mgs_cache_none;
-    }
-    else if (strcasecmp("dbm", type) == 0) {
-        sc->cache_type = mgs_cache_dbm;
+        sc->cache_type = mgs_cache_none;
+    } else if (strcasecmp("dbm", type) == 0) {
+        sc->cache_type = mgs_cache_dbm;
     }
 #if HAVE_APR_MEMCACHE
     else if (strcasecmp("memcache", type) == 0) {
-        sc->cache_type = mgs_cache_memcache;
+        sc->cache_type = mgs_cache_memcache;
     }
 #endif
     else {
-        return "Invalid Type for GnuTLSCache!";
+        return "Invalid Type for GnuTLSCache!";
     }
 
     if (sc->cache_type == mgs_cache_dbm) {
-        sc->cache_config = ap_server_root_relative(parms->pool, arg);
-    }
-    else {
-        sc->cache_config = apr_pstrdup(parms->pool, arg);
+        sc->cache_config = ap_server_root_relative(parms->pool, arg);
+    } else {
+        sc->cache_config = apr_pstrdup(parms->pool, arg);
     }
 
@@ -153 +206 @@
 
 const char *mgs_set_cache_timeout(cmd_parms * parms, void *dummy,
-                                            const char *arg)
+                                  const char *arg)
 {
     int argint;
     mgs_srvconf_rec *sc =
-    (mgs_srvconf_rec *) ap_get_module_config(parms->server->
-                                                    module_config,
-                                                    &gnutls_module);
-    
+        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
+                                                 module_config,
+                                                 &gnutls_module);
+
     argint = atoi(arg);
-    
+
     if (argint < 0) {
-        return "GnuTLSCacheTimeout: Invalid argument";
-    }
-    else if (argint == 0) {
-        sc->cache_timeout = 0;
-    }
-    else {
-        sc->cache_timeout = apr_time_from_sec(argint);
-    }
-    
+        return "GnuTLSCacheTimeout: Invalid argument";
+    } else if (argint == 0) {
+        sc->cache_timeout = 0;
+    } else {
+        sc->cache_timeout = apr_time_from_sec(argint);
+    }
+
     return NULL;
 }
 
 const char *mgs_set_client_verify(cmd_parms * parms, void *dummy,
-                                            const char *arg)
+                                  const char *arg)
 {
     int mode;
 
     if (strcasecmp("none", arg) == 0 || strcasecmp("ignore", arg) == 0) {
-        mode = GNUTLS_CERT_IGNORE;
-    }
-    else if (strcasecmp("optional", arg) == 0 || strcasecmp("request", arg) == 0) {
-        mode = GNUTLS_CERT_REQUEST;
-    }
-    else if (strcasecmp("require", arg) == 0) {
-        mode = GNUTLS_CERT_REQUIRE;
-    }
-    else {
-        return "GnuTLSClientVerify: Invalid argument";
-    }
-    
+        mode = GNUTLS_CERT_IGNORE;
+    } else if (strcasecmp("optional", arg) == 0
+               || strcasecmp("request", arg) == 0) {
+        mode = GNUTLS_CERT_REQUEST;
+    } else if (strcasecmp("require", arg) == 0) {
+        mode = GNUTLS_CERT_REQUIRE;
+    } else {
+        return "GnuTLSClientVerify: Invalid argument";
+    }
+
     /* This was set from a directory context */
     if (parms->path) {
-        mgs_dirconf_rec *dc = (mgs_dirconf_rec *)dummy;
-        dc->client_verify_mode = mode;
-    }
-    else {
-        mgs_srvconf_rec *sc =
-        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
-                                                        module_config,
-                                                        &gnutls_module);        
-        sc->client_verify_mode = mode;
+        mgs_dirconf_rec *dc = (mgs_dirconf_rec *) dummy;
+        dc->client_verify_mode = mode;
+    } else {
+        mgs_srvconf_rec *sc =
+            (mgs_srvconf_rec *) ap_get_module_config(parms->server->
+                                                     module_config,
+                                                     &gnutls_module);
+        sc->client_verify_mode = mode;
     }
 
@@ -211 +259 @@
 
 const char *mgs_set_client_ca_file(cmd_parms * parms, void *dummy,
-                                            const char *arg)
+                                   const char *arg)
 {
     int rv;
-    const char* file;
-    apr_pool_t* spool;
+    const char *file;
+    apr_pool_t *spool;
     gnutls_datum_t data;
 
-    mgs_srvconf_rec *sc = 
-        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
-                                                        module_config,
-                                                        &gnutls_module);        
+    mgs_srvconf_rec *sc =
+        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
+                                                 module_config,
+                                                 &gnutls_module);
     apr_pool_create(&spool, parms->pool);
 
     file = ap_server_root_relative(spool, arg);
 
-    sc->ca_list_size = 16;
-
-    load_datum_from_file(spool, file, &data);
-
-    rv = gnutls_x509_crt_list_import(sc->ca_list, &sc->ca_list_size, 
-                                     &data, GNUTLS_X509_FMT_PEM,
-                                     GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED);
+    if (load_datum_from_file(spool, file, &data) != 0) {
+        return apr_psprintf(parms->pool, "GnuTLS: Error Reading "
+                            "Client CA File '%s'", file);
+    }
+
+    sc->ca_list_size = MAX_CA_CRTS;
+    rv = gnutls_x509_crt_list_import(sc->ca_list, &sc->ca_list_size,
+                                     &data, GNUTLS_X509_FMT_PEM,
+                                     GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED);
     if (rv < 0) {
-        return apr_psprintf(parms->pool, "GnuTLS: Failed to load "
-                            "Client CA File '%s': (%d) %s", file, rv, 
-                            gnutls_strerror(rv));   
+        return apr_psprintf(parms->pool, "GnuTLS: Failed to load "
+                            "Client CA File '%s': (%d) %s", file, rv,
+                            gnutls_strerror(rv));
     }
 
@@ -244 +294 @@
 
 const char *mgs_set_enabled(cmd_parms * parms, void *dummy,
-                                      const char *arg)
-{
-    mgs_srvconf_rec *sc =
-        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
-                                                        module_config,
-                                                        &gnutls_module);
+                            const char *arg)
+{
+    mgs_srvconf_rec *sc =
+        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
+                                                 module_config,
+                                                 &gnutls_module);
     if (!strcasecmp(arg, "On")) {
-        sc->enabled = GNUTLS_ENABLED_TRUE;
-    }
-    else if (!strcasecmp(arg, "Off")) {
-        sc->enabled = GNUTLS_ENABLED_FALSE;
-    }
-    else {
-        return "GnuTLSEnable must be set to 'On' or 'Off'";
+        sc->enabled = GNUTLS_ENABLED_TRUE;
+    } else if (!strcasecmp(arg, "Off")) {
+        sc->enabled = GNUTLS_ENABLED_FALSE;
+    } else {
+        return "GnuTLSEnable must be set to 'On' or 'Off'";
+    }
+
+    return NULL;
+}
+
+const char *mgs_set_export_certificates_enabled(cmd_parms * parms, void *dummy,
+                            const char *arg)
+{
+    mgs_srvconf_rec *sc =
+        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
+                                                 module_config,
+                                                 &gnutls_module);
+    if (!strcasecmp(arg, "On")) {
+        sc->export_certificates_enabled = GNUTLS_ENABLED_TRUE;
+    } else if (!strcasecmp(arg, "Off")) {
+        sc->export_certificates_enabled = GNUTLS_ENABLED_FALSE;
+    } else {
+        return "GnuTLSExportCertificates must be set to 'On' or 'Off'";
+    }
+
+    return NULL;
+}
+
+
+const char *mgs_set_priorities(cmd_parms * parms, void *dummy, const char *arg)
+{
+    int ret;
+    char *err;
+    mgs_srvconf_rec *sc =
+        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
+                                                 module_config,
+                                                 &gnutls_module);
+
+
+    ret = gnutls_priority_init( &sc->priorities, arg, &err);
+    if (ret < 0) {
+      if (ret == GNUTLS_E_INVALID_REQUEST)
+        return apr_psprintf(parms->pool, "GnuTLS: Syntax error parsing priorities string at: %s", err);
+      return "Error setting priorities";
     }
 
@@ -265 +352 @@
 void *mgs_config_server_create(apr_pool_t * p, server_rec * s)
 {
-    int i;
     mgs_srvconf_rec *sc = apr_pcalloc(p, sizeof(*sc));
-    
+
     sc->enabled = GNUTLS_ENABLED_FALSE;
-    
+
     gnutls_certificate_allocate_credentials(&sc->certs);
+    gnutls_anon_allocate_server_credentials(&sc->anon_creds);
+    gnutls_srp_allocate_server_credentials(&sc->srp_creds);
+
+    sc->srp_tpasswd_conf_file = NULL;
+    sc->srp_tpasswd_file = NULL;
     sc->privkey_x509 = NULL;
     sc->cert_x509 = NULL;
@@ -276 +367 @@
     sc->cache_type = mgs_cache_dbm;
     sc->cache_config = ap_server_root_relative(p, "conf/gnutls_cache");
-    
-    /* TODO: Make this Configurable. But it isn't configurable in mod_ssl? */
+
     sc->dh_params_file = ap_server_root_relative(p, "conf/dhfile");
     sc->rsa_params_file = ap_server_root_relative(p, "conf/rsafile");
-    
-    /* Finish SSL Client Certificate Support */
+
     sc->client_verify_mode = GNUTLS_CERT_IGNORE;
-    
-    /* TODO: Make this Configurable ! */
-    /* mod_ssl uses a flex based parser for this part.. sigh */
-    i = 0;
-    sc->ciphers[i++] = GNUTLS_CIPHER_AES_256_CBC;
-    sc->ciphers[i++] = GNUTLS_CIPHER_AES_128_CBC;
-    sc->ciphers[i++] = GNUTLS_CIPHER_ARCFOUR_128;
-    sc->ciphers[i++] = GNUTLS_CIPHER_3DES_CBC;
-    sc->ciphers[i++] = GNUTLS_CIPHER_ARCFOUR_40;
-    sc->ciphers[i] = 0;
-    
-    i = 0;
-    sc->key_exchange[i++] = GNUTLS_KX_RSA;
-    sc->key_exchange[i++] = GNUTLS_KX_RSA_EXPORT;
-    sc->key_exchange[i++] = GNUTLS_KX_DHE_DSS;
-    sc->key_exchange[i++] = GNUTLS_KX_DHE_RSA;
-    sc->key_exchange[i++] = GNUTLS_KX_ANON_DH;
-    sc->key_exchange[i++] = GNUTLS_KX_SRP;
-    sc->key_exchange[i++] = GNUTLS_KX_SRP_RSA;
-    sc->key_exchange[i++] = GNUTLS_KX_SRP_DSS;
-    sc->key_exchange[i] = 0;
-    
-    i = 0;
-    sc->macs[i++] = GNUTLS_MAC_SHA;
-    sc->macs[i++] = GNUTLS_MAC_MD5;
-    sc->macs[i++] = GNUTLS_MAC_RMD160;
-    sc->macs[i] = 0;
-    
-    i = 0;
-    sc->protocol[i++] = GNUTLS_TLS1_1;
-    sc->protocol[i++] = GNUTLS_TLS1;
-    sc->protocol[i++] = GNUTLS_SSL3;
-    sc->protocol[i] = 0;
-    
-    i = 0;
-    sc->compression[i++] = GNUTLS_COMP_NULL;
-    sc->compression[i++] = GNUTLS_COMP_ZLIB;
-    sc->compression[i++] = GNUTLS_COMP_LZO;
-    sc->compression[i] = 0;
-    
-    i = 0;
-    sc->cert_types[i++] = GNUTLS_CRT_X509;
-    sc->cert_types[i] = 0;
-    
+
     return sc;
 }
 
-void *mgs_config_dir_merge(apr_pool_t *p, void *basev, void *addv)
+void *mgs_config_dir_merge(apr_pool_t * p, void *basev, void *addv)
 {
     mgs_dirconf_rec *new;
-    mgs_dirconf_rec *base = (mgs_dirconf_rec *) basev;
+/*    mgs_dirconf_rec *base = (mgs_dirconf_rec *) basev; */
     mgs_dirconf_rec *add = (mgs_dirconf_rec *) addv;
-    
+
     new = (mgs_dirconf_rec *) apr_pcalloc(p, sizeof(mgs_dirconf_rec));
     new->lua_bytecode = apr_pstrmemdup(p, add->lua_bytecode,
-                                       add->lua_bytecode_len);
+                                       add->lua_bytecode_len);
     new->lua_bytecode_len = add->lua_bytecode_len;
     new->client_verify_mode = add->client_verify_mode;
@@ -344 +390 @@
 }
 
-void *mgs_config_dir_create(apr_pool_t *p, char *dir)
+void *mgs_config_dir_create(apr_pool_t * p, char *dir)
 {
     mgs_dirconf_rec *dc = apr_palloc(p, sizeof(*dc));
-    
+
     dc->client_verify_mode = -1;
     dc->lua_bytecode = NULL;
@@ -353 +399 @@
     return dc;
 }
-

src/gnutls_hooks.c

@@ -1 +1 @@
 /**
  *  Copyright 2004-2005 Paul Querna
+ *  Copyright 2007 Nikos Mavrogiannopoulos
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -29 +30 @@
 
 #if MOD_GNUTLS_DEBUG
-static apr_file_t* debug_log_fp;
+static apr_file_t *debug_log_fp;
 #endif
 
 static int mpm_is_threaded;
+
+static int mgs_cert_verify(request_rec * r, mgs_handle_t * ctxt);
+/* use side==0 for server and side==1 for client */
+static void mgs_add_common_cert_vars(request_rec * r, gnutls_x509_crt cert,
+                                     int side, int export_certificates_enabled);
 
 static apr_status_t mgs_cleanup_pre_config(void *data)
@@ -41 +47 @@
 
 #if MOD_GNUTLS_DEBUG
-static void gnutls_debug_log_all( int level, const char* str)
+static void gnutls_debug_log_all(int level, const char *str)
 {
     apr_file_printf(debug_log_fp, "<%d> %s\n", level, str);
@@ -47 +53 @@
 #endif
 
-int mgs_hook_pre_config(apr_pool_t * pconf,
-                        apr_pool_t * plog, apr_pool_t * ptemp)
+int
+mgs_hook_pre_config(apr_pool_t * pconf,
+                    apr_pool_t * plog, apr_pool_t * ptemp)
 {
 
@@ -54 +61 @@
     ap_mpm_query(AP_MPMQ_IS_THREADED, &mpm_is_threaded);
     if (mpm_is_threaded) {
-        gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+        gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
     }
 #else
@@ -63 +70 @@
 
     apr_pool_cleanup_register(pconf, NULL, mgs_cleanup_pre_config,
-                              apr_pool_cleanup_null);
+                              apr_pool_cleanup_null);
 
 #if MOD_GNUTLS_DEBUG
     apr_file_open(&debug_log_fp, "/tmp/gnutls_debug",
-                  APR_APPEND|APR_WRITE|APR_CREATE, APR_OS_DEFAULT, pconf);
+                  APR_APPEND | APR_WRITE | APR_CREATE, APR_OS_DEFAULT,
+                  pconf);
 
     gnutls_global_set_log_level(9);
@@ -77 +85 @@
 
 
-static gnutls_datum load_params(const char* file, server_rec* s, 
-                                apr_pool_t* pool) 
+static gnutls_datum
+load_params(const char *file, server_rec * s, apr_pool_t * pool)
 {
     gnutls_datum ret = { NULL, 0 };
-    apr_file_t* fp;
+    apr_file_t *fp;
     apr_finfo_t finfo;
     apr_status_t rv;
     apr_size_t br = 0;
 
-    rv = apr_file_open(&fp, file, APR_READ|APR_BINARY, APR_OS_DEFAULT, 
-                       pool);
+    rv = apr_file_open(&fp, file, APR_READ | APR_BINARY, APR_OS_DEFAULT,
+                       pool);
     if (rv != APR_SUCCESS) {
-        ap_log_error(APLOG_MARK, APLOG_STARTUP, rv, s, 
-                     "GnuTLS failed to load params file at: %s", file);
-        return ret;
+        ap_log_error(APLOG_MARK, APLOG_STARTUP, rv, s,
+                     "GnuTLS failed to load params file at: %s. Will use internal params.", file);
+        return ret;
     }
 
@@ -97 +105 @@
 
     if (rv != APR_SUCCESS) {
-        ap_log_error(APLOG_MARK, APLOG_STARTUP, rv, s, 
-                     "GnuTLS failed to stat params file at: %s", file);
-        return ret;
-    }
-
-    ret.data = apr_palloc(pool, finfo.size+1);
+        ap_log_error(APLOG_MARK, APLOG_STARTUP, rv, s,
+                     "GnuTLS failed to stat params file at: %s", file);
+        return ret;
+    }
+
+    ret.data = apr_palloc(pool, finfo.size + 1);
     rv = apr_file_read_full(fp, ret.data, finfo.size, &br);
 
     if (rv != APR_SUCCESS) {
-        ap_log_error(APLOG_MARK, APLOG_STARTUP, rv, s, 
-                     "GnuTLS failed to read params file at: %s", file);
-        return ret;
+        ap_log_error(APLOG_MARK, APLOG_STARTUP, rv, s,
+                     "GnuTLS failed to read params file at: %s", file);
+        return ret;
     }
     apr_file_close(fp);
@@ -117 +125 @@
 }
 
-int mgs_hook_post_config(apr_pool_t * p, apr_pool_t * plog,
-                                       apr_pool_t * ptemp,
-                                       server_rec * base_server)
+/* We don't support openpgp certificates, yet */
+const static int cert_type_prio[2] = { GNUTLS_CRT_X509, 0 };
+
+static int mgs_select_virtual_server_cb( gnutls_session_t session)
+{
+    mgs_handle_t *ctxt;
+    mgs_srvconf_rec *tsc;
+    int ret;
+
+    ctxt = gnutls_transport_get_ptr(session);
+
+    /* find the virtual server */
+    tsc = mgs_find_sni_server(session);
+
+    if (tsc != NULL)
+        ctxt->sc = tsc;
+
+    gnutls_certificate_server_set_request(session,
+       ctxt->sc->client_verify_mode);
+
+    /* set the new server credentials 
+     */
+
+    gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE,
+      ctxt->sc->certs);
+
+    gnutls_credentials_set(session, GNUTLS_CRD_ANON,
+      ctxt->sc->anon_creds);
+
+    if ( ctxt->sc->srp_tpasswd_conf_file != NULL && ctxt->sc->srp_tpasswd_file != NULL) {
+       gnutls_credentials_set(session, GNUTLS_CRD_SRP,
+         ctxt->sc->srp_creds);
+    }
+
+    /* update the priorities - to avoid negotiating a ciphersuite that is not
+     * enabled on this virtual server. Note that here we ignore the version
+     * negotiation.
+     */
+    ret = gnutls_priority_set( session, ctxt->sc->priorities);
+    gnutls_certificate_type_set_priority( session, cert_type_prio);
+    
+    
+    /* actually it shouldn't fail since we have checked at startup */
+    if (ret < 0) return ret;
+
+    /* allow separate caches per virtual host. Actually allowing the same is not
+     * a good idea, especially if they have different security requirements.
+     */
+    mgs_cache_session_init(ctxt);
+
+    return 0;
+}
+
+static int cert_retrieve_fn(gnutls_session_t session, gnutls_retr_st * ret)
+{
+    mgs_handle_t *ctxt;
+
+    ctxt = gnutls_transport_get_ptr(session);
+
+    ret->type = GNUTLS_CRT_X509;
+    ret->ncerts = 1;
+    ret->deinit_all = 0;
+
+    ret->cert.x509 = &ctxt->sc->cert_x509;
+    ret->key.x509 = ctxt->sc->privkey_x509;
+    return 0;
+}
+
+const char static_dh_params[] = "-----BEGIN DH PARAMETERS-----\n"
+"MIIBBwKCAQCsa9tBMkqam/Fm3l4TiVgvr3K2ZRmH7gf8MZKUPbVgUKNzKcu0oJnt\n"
+"gZPgdXdnoT3VIxKrSwMxDc1/SKnaBP1Q6Ag5ae23Z7DPYJUXmhY6s2YaBfvV+qro\n"
+"KRipli8Lk7hV+XmT7Jde6qgNdArb9P90c1nQQdXDPqcdKB5EaxR3O8qXtDoj+4AW\n"
+"dr0gekNsZIHx0rkHhxdGGludMuaI+HdIVEUjtSSw1X1ep3onddLs+gMs+9v1L7N4\n"
+"YWAnkATleuavh05zA85TKZzMBBx7wwjYKlaY86jQw4JxrjX46dv7tpS1yAPYn3rk\n"
+"Nd4jbVJfVHWbZeNy/NaO8g+nER+eSv9zAgEC\n"
+"-----END DH PARAMETERS-----\n";
+
+int
+mgs_hook_post_config(apr_pool_t * p, apr_pool_t * plog,
+                     apr_pool_t * ptemp, server_rec * base_server)
 {
     int rv;
-    int data_len;
+    size_t data_len;
     server_rec *s;
     gnutls_dh_params_t dh_params;
@@ -131 +216 @@
     int first_run = 0;
     const char *userdata_key = "mgs_init";
-         
+
     apr_pool_userdata_get(&data, userdata_key, base_server->process->pool);
     if (data == NULL) {
-        first_run = 1;
-        apr_pool_userdata_set((const void *)1, userdata_key, 
-                              apr_pool_cleanup_null, 
-                              base_server->process->pool);
+        first_run = 1;
+        apr_pool_userdata_set((const void *) 1, userdata_key,
+                              apr_pool_cleanup_null,
+                              base_server->process->pool);
     }
 
 
     {
-        gnutls_datum pdata;
-        apr_pool_t* tpool;
-        s = base_server;
-        sc_base = (mgs_srvconf_rec *) ap_get_module_config(s->module_config,
-                                                             &gnutls_module);
-
-        apr_pool_create(&tpool, p);
-
-        gnutls_dh_params_init(&dh_params);
-
-        pdata = load_params(sc_base->dh_params_file, s, tpool);
-
-        if (pdata.size != 0) {
-            rv = gnutls_dh_params_import_pkcs3(dh_params, &pdata, 
-                                               GNUTLS_X509_FMT_PEM);
-            if (rv != 0) {
-                ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s, 
-                             "GnuTLS: Unable to load DH Params: (%d) %s",
-                             rv, gnutls_strerror(rv));
-                exit(rv);
+        gnutls_datum pdata;
+        apr_pool_t *tpool;
+        s = base_server;
+        sc_base =
+            (mgs_srvconf_rec *) ap_get_module_config(s->module_config,
+                                                     &gnutls_module);
+
+        apr_pool_create(&tpool, p);
+
+        gnutls_dh_params_init(&dh_params);
+
+        pdata = load_params(sc_base->dh_params_file, s, tpool);
+
+        if (pdata.size != 0) {
+            rv = gnutls_dh_params_import_pkcs3(dh_params, &pdata,
+                                               GNUTLS_X509_FMT_PEM);
+            if (rv != 0) {
+                ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s,
+                             "GnuTLS: Unable to load DH Params: (%d) %s",
+                             rv, gnutls_strerror(rv));
+                exit(rv);
+            }
+        } else {
+            /* If the file does not exist use internal parameters
+             */
+            pdata.data = (void*)static_dh_params;
+            pdata.size = sizeof( static_dh_params);
+            rv = gnutls_dh_params_import_pkcs3(dh_params, &pdata,
+                                               GNUTLS_X509_FMT_PEM);
+
+            if (rv < 0) {
+              ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s,
+                         "GnuTLS: Unable to load internal DH Params."
+                         " Shutting down.");
+              exit(-1);
             }
-        }
-        else {
-            ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s, 
-                         "GnuTLS: Unable to load DH Params."
-                         " Shutting Down.");
-            exit(-1);
-        }
-        apr_pool_clear(tpool);
-
-        gnutls_rsa_params_init(&rsa_params);
-
-        pdata = load_params(sc_base->rsa_params_file, s, tpool);
-
-        if (pdata.size != 0) {
-            rv = gnutls_rsa_params_import_pkcs1(rsa_params, &pdata, 
-                                                GNUTLS_X509_FMT_PEM);
-            if (rv != 0) {
-                ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s, 
-                             "GnuTLS: Unable to load RSA Params: (%d) %s",
-                             rv, gnutls_strerror(rv));
-                exit(rv);
-            }
-        }
-        else {
-            ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s, 
-                         "GnuTLS: Unable to load RSA Params."
-                         " Shutting Down.");
-            exit(-1);
-        }
-
-        apr_pool_destroy(tpool);
-        rv = mgs_cache_post_config(p, s, sc_base);
-        if (rv != 0) {
-            ap_log_error(APLOG_MARK, APLOG_STARTUP, rv, s, 
-                         "GnuTLS: Post Config for GnuTLSCache Failed."
-                         " Shutting Down.");
-            exit(-1);
-        }
-         
-        for (s = base_server; s; s = s->next) {
-            sc = (mgs_srvconf_rec *) ap_get_module_config(s->module_config,
-                                                                 &gnutls_module);
-            sc->cache_type = sc_base->cache_type;
-            sc->cache_config = sc_base->cache_config;
-
-            gnutls_certificate_set_rsa_export_params(sc->certs, 
-                                                     rsa_params);
-            gnutls_certificate_set_dh_params(sc->certs, dh_params);
-
-            if (sc->cert_x509 == NULL && sc->enabled == GNUTLS_ENABLED_TRUE) {
-                ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
-                             "[GnuTLS] - Host '%s:%d' is missing a "
-                             "Certificate File!",
-                         s->server_hostname, s->port);
-                exit(-1);
+        }
+        apr_pool_clear(tpool);
+
+        rsa_params = NULL;
+        
+        pdata = load_params(sc_base->rsa_params_file, s, tpool);
+
+        if (pdata.size != 0) {
+            gnutls_rsa_params_init(&rsa_params);
+            rv = gnutls_rsa_params_import_pkcs1(rsa_params, &pdata,
+                                                GNUTLS_X509_FMT_PEM);
+            if (rv != 0) {
+                ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, s,
+                             "GnuTLS: Unable to load RSA Params: (%d) %s",
+                             rv, gnutls_strerror(rv));
+                exit(rv);
+            }
+        } 
+        /* not an error but RSA-EXPORT ciphersuites are not available 
+         */
+
+        apr_pool_destroy(tpool);
+        rv = mgs_cache_post_config(p, s, sc_base);
+        if (rv != 0) {
+            ap_log_error(APLOG_MARK, APLOG_STARTUP, rv, s,
+                         "GnuTLS: Post Config for GnuTLSCache Failed."
+                         " Shutting Down.");
+            exit(-1);
+        }
+
+        for (s = base_server; s; s = s->next) {
+            sc = (mgs_srvconf_rec *) ap_get_module_config(s->module_config,
+                                                          &gnutls_module);
+            sc->cache_type = sc_base->cache_type;
+            sc->cache_config = sc_base->cache_config;
+
+            if (rsa_params != NULL)
+              gnutls_certificate_set_rsa_export_params(sc->certs,
+                                                     rsa_params);
+            gnutls_certificate_set_dh_params(sc->certs, dh_params);
+
+            gnutls_anon_set_server_dh_params( sc->anon_creds, dh_params);
+            
+            gnutls_certificate_server_set_retrieve_function(sc->certs,
+                                                    cert_retrieve_fn);
+
+            if ( sc->srp_tpasswd_conf_file != NULL && sc->srp_tpasswd_file != NULL) {
+                gnutls_srp_set_server_credentials_file( sc->srp_creds, 
+                    sc->srp_tpasswd_file, sc->srp_tpasswd_conf_file);
             }
             
-            if (sc->privkey_x509 == NULL && sc->enabled == GNUTLS_ENABLED_TRUE) {
-                ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
-                             "[GnuTLS] - Host '%s:%d' is missing a "
-                             "Private Key File!",
-                             s->server_hostname, s->port);
-                exit(-1);
+            if (sc->cert_x509 == NULL
+                && sc->enabled == GNUTLS_ENABLED_TRUE) {
+                ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
+                             "[GnuTLS] - Host '%s:%d' is missing a "
+                             "Certificate File!", s->server_hostname,
+                             s->port);
+                exit(-1);
+            }
+
+            if (sc->privkey_x509 == NULL
+                && sc->enabled == GNUTLS_ENABLED_TRUE) {
+                ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,
+                             "[GnuTLS] - Host '%s:%d' is missing a "
+                             "Private Key File!",
+                             s->server_hostname, s->port);
+                exit(-1);
+            }
+
+            if (sc->enabled == GNUTLS_ENABLED_TRUE) {
+            rv = gnutls_x509_crt_get_dn_by_oid(sc->cert_x509,
+                                               GNUTLS_OID_X520_COMMON_NAME,
+                                               0, 0, NULL, &data_len);
+
+            if (data_len < 1) {
+                sc->enabled = GNUTLS_ENABLED_FALSE;
+                sc->cert_cn = NULL;
+                continue;
+            }
+
+            sc->cert_cn = apr_palloc(p, data_len);
+            rv = gnutls_x509_crt_get_dn_by_oid(sc->cert_x509,
+                                               GNUTLS_OID_X520_COMMON_NAME,
+                                               0, 0, sc->cert_cn,
+                                               &data_len);
             }
-            
-            rv = gnutls_x509_crt_get_dn_by_oid(sc->cert_x509, 
-                                               GNUTLS_OID_X520_COMMON_NAME, 0, 0,
-                                               NULL, &data_len);
-            
-            if (data_len < 1) {
-                sc->enabled = GNUTLS_ENABLED_FALSE;
-                sc->cert_cn = NULL;
-                continue;
-            }
-            
-            sc->cert_cn = apr_palloc(p, data_len);
-            rv = gnutls_x509_crt_get_dn_by_oid(sc->cert_x509, 
-                                               GNUTLS_OID_X520_COMMON_NAME, 0, 0,
-                                               sc->cert_cn, &data_len);
-        }
+        }
     }
 
@@ -250 +357 @@
 }
 
-void mgs_hook_child_init(apr_pool_t *p, server_rec *s)
+void mgs_hook_child_init(apr_pool_t * p, server_rec * s)
 {
     apr_status_t rv = APR_SUCCESS;
     mgs_srvconf_rec *sc = ap_get_module_config(s->module_config,
-                                                      &gnutls_module);
+                                               &gnutls_module);
 
     if (sc->cache_type != mgs_cache_none) {
-        rv = mgs_cache_child_init(p, s, sc);
-        if(rv != APR_SUCCESS) {
-            ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,
-                             "[GnuTLS] - Failed to run Cache Init");
-        }
-    }
-    else {
-        ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s,
-                     "[GnuTLS] - No Cache Configured. Hint: GnuTLSCache");
+        rv = mgs_cache_child_init(p, s, sc);
+        if (rv != APR_SUCCESS) {
+            ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,
+                         "[GnuTLS] - Failed to run Cache Init");
+        }
+    } else {
+        ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s,
+                     "[GnuTLS] - No Cache Configured. Hint: GnuTLSCache");
     }
 }
@@ -272 +378 @@
 {
     mgs_srvconf_rec *sc =
-        (mgs_srvconf_rec *) ap_get_module_config(r->server->
-                                                        module_config,
-                                                        &gnutls_module);
+        (mgs_srvconf_rec *) ap_get_module_config(r->server->module_config,
+                                                 &gnutls_module);
 
     if (sc->enabled == GNUTLS_ENABLED_FALSE) {
-        return NULL;
+        return NULL;
     }
 
@@ -286 +391 @@
 {
     mgs_srvconf_rec *sc =
-        (mgs_srvconf_rec *) ap_get_module_config(r->server->
-                                                        module_config,
-                                                        &gnutls_module);
+        (mgs_srvconf_rec *) ap_get_module_config(r->server->module_config,
+                                                 &gnutls_module);
 
     if (sc->enabled == GNUTLS_ENABLED_FALSE) {
-        return 0;
+        return 0;
     }
 
@@ -300 +404 @@
 
 #if USING_2_1_RECENT
-typedef struct
-{
+typedef struct {
     mgs_handle_t *ctxt;
     mgs_srvconf_rec *sc;
-    const char* sni_name;
+    const char *sni_name;
 } vhost_cb_rec;
 
-static int vhost_cb (void* baton, conn_rec* conn, server_rec* s)
+static int vhost_cb(void *baton, conn_rec * conn, server_rec * s)
 {
     mgs_srvconf_rec *tsc;
-    vhost_cb_rec* x = baton;
+    vhost_cb_rec *x = baton;
 
     tsc = (mgs_srvconf_rec *) ap_get_module_config(s->module_config,
-                                                          &gnutls_module);
-    
+                                                   &gnutls_module);
+
     if (tsc->enabled != GNUTLS_ENABLED_TRUE || tsc->cert_cn == NULL) {
-        return 0;
-    }
-    
+        return 0;
+    }
+
     /* The CN can contain a * -- this will match those too. */
     if (ap_strcasecmp_match(x->sni_name, tsc->cert_cn) == 0) {
-        /* found a match */
+        /* found a match */
 #if MOD_GNUTLS_DEBUG
-        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
-                     x->ctxt->c->base_server,
-                     "GnuTLS: Virtual Host CB: "
-                     "'%s' == '%s'", tsc->cert_cn, x->sni_name);
-#endif
-        /* Because we actually change the server used here, we need to reset
-         * things like ClientVerify.
-         */
-        x->sc = tsc;
-        /* Shit. Crap. Dammit. We *really* should rehandshake here, as our
-         * certificate structure *should* change when the server changes. 
-         * acccckkkkkk. 
-         */
-        return 1;
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
+                     x->ctxt->c->base_server,
+                     "GnuTLS: Virtual Host CB: "
+                     "'%s' == '%s'", tsc->cert_cn, x->sni_name);
+#endif
+        /* Because we actually change the server used here, we need to reset
+         * things like ClientVerify.
+         */
+        x->sc = tsc;
+        /* Shit. Crap. Dammit. We *really* should rehandshake here, as our
+         * certificate structure *should* change when the server changes. 
+         * acccckkkkkk. 
+         */
+        return 1;
     }
     return 0;
@@ -342 +445 @@
 #endif
 
-mgs_srvconf_rec* mgs_find_sni_server(gnutls_session_t session) 
+mgs_srvconf_rec *mgs_find_sni_server(gnutls_session_t session)
 {
     int rv;
-    int sni_type;
-    int data_len = MAX_HOST_LEN;
+    unsigned int sni_type;
+    size_t data_len = MAX_HOST_LEN;
     char sni_name[MAX_HOST_LEN];
     mgs_handle_t *ctxt;
@@ -352 +455 @@
     vhost_cb_rec cbx;
 #else
-    server_rec* s;
-    mgs_srvconf_rec *tsc;    
-#endif
-    
+    server_rec *s;
+    mgs_srvconf_rec *tsc;
+#endif
+
     ctxt = gnutls_transport_get_ptr(session);
-    
+
     sni_type = gnutls_certificate_type_get(session);
     if (sni_type != GNUTLS_CRT_X509) {
-        /* In theory, we could support OpenPGP Certificates. Theory != code. */
-        ap_log_error(APLOG_MARK, APLOG_CRIT, 0,
-                     ctxt->c->base_server,
-                     "GnuTLS: Only x509 Certificates are currently supported.");
-        return NULL;
-    }
-    
-    rv = gnutls_server_name_get(ctxt->session, sni_name, 
-                                &data_len, &sni_type, 0);
-    
+        /* In theory, we could support OpenPGP Certificates. Theory != code. */
+        ap_log_error(APLOG_MARK, APLOG_CRIT, 0,
+                     ctxt->c->base_server,
+                     "GnuTLS: Only x509 Certificates are currently supported.");
+        return NULL;
+    }
+
+    rv = gnutls_server_name_get(ctxt->session, sni_name,
+                                &data_len, &sni_type, 0);
+
     if (rv != 0) {
-        return NULL;
-    }
-    
+        return NULL;
+    }
+
     if (sni_type != GNUTLS_NAME_DNS) {
-        ap_log_error(APLOG_MARK, APLOG_CRIT, 0,
-                     ctxt->c->base_server,
-                     "GnuTLS: Unknown type '%d' for SNI: "
-                     "'%s'", sni_type, sni_name);
-        return NULL;
-    }
-    
+        ap_log_error(APLOG_MARK, APLOG_CRIT, 0,
+                     ctxt->c->base_server,
+                     "GnuTLS: Unknown type '%d' for SNI: "
+                     "'%s'", sni_type, sni_name);
+        return NULL;
+    }
+
     /**
      * Code in the Core already sets up the c->base_server as the base
@@ -390 +493 @@
     cbx.sc = NULL;
     cbx.sni_name = sni_name;
-    
+
     rv = ap_vhost_iterate_given_conn(ctxt->c, vhost_cb, &cbx);
     if (rv == 1) {
-        return cbx.sc;
+        return cbx.sc;
     }
 #else
     for (s = ap_server_conf; s; s = s->next) {
-        
-        tsc = (mgs_srvconf_rec *) ap_get_module_config(s->module_config,
-                                                       &gnutls_module);
-        if (tsc->enabled != GNUTLS_ENABLED_TRUE) {
-            continue;
-        }
+
+        tsc = (mgs_srvconf_rec *) ap_get_module_config(s->module_config,
+                                                       &gnutls_module);
+        if (tsc->enabled != GNUTLS_ENABLED_TRUE) {
+            continue;
+        }
 #if MOD_GNUTLS_DEBUG
-        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
-                     ctxt->c->base_server,
-                     "GnuTLS: sni-x509 cn: %s/%d pk: %s s: 0x%08X s->n: 0x%08X  sc: 0x%08X", tsc->cert_cn, rv,
-                     gnutls_pk_algorithm_get_name(gnutls_x509_privkey_get_pk_algorithm(ctxt->sc->privkey_x509)),
-                     (unsigned int)s, (unsigned int)s->next, (unsigned int)tsc);
-#endif            
-        /* The CN can contain a * -- this will match those too. */
-        if (ap_strcasecmp_match(sni_name, tsc->cert_cn) == 0) {
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
+                     ctxt->c->base_server,
+                     "GnuTLS: sni-x509 cn: %s/%d pk: %s s: 0x%08X s->n: 0x%08X  sc: 0x%08X",
+                     tsc->cert_cn, rv,
+                     gnutls_pk_algorithm_get_name
+                     (gnutls_x509_privkey_get_pk_algorithm
+                      (ctxt->sc->privkey_x509)), (unsigned int) s,
+                     (unsigned int) s->next, (unsigned int) tsc);
+#endif
+        /* The CN can contain a * -- this will match those too. */
+        if (ap_strcasecmp_match(sni_name, tsc->cert_cn) == 0) {
 #if MOD_GNUTLS_DEBUG
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
-                         ctxt->c->base_server,
-                         "GnuTLS: Virtual Host: "
-                         "'%s' == '%s'", tsc->cert_cn, sni_name);
-#endif
-            return tsc;
-        }
+            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
+                         ctxt->c->base_server,
+                         "GnuTLS: Virtual Host: "
+                         "'%s' == '%s'", tsc->cert_cn, sni_name);
+#endif
+            return tsc;
+        }
     }
 #endif
@@ -426 +532 @@
 
 
-static int cert_retrieve_fn(gnutls_session_t session, gnutls_retr_st* ret) 
-{
-    mgs_handle_t *ctxt;
-    mgs_srvconf_rec *tsc;
-    
-    ctxt = gnutls_transport_get_ptr(session);
-
-    ret->type = GNUTLS_CRT_X509;
-    ret->ncerts = 1;
-    ret->deinit_all = 0;
-
-    tsc = mgs_find_sni_server(session);
-    
-    if (tsc != NULL) {
-        ctxt->sc = tsc;
-        gnutls_certificate_server_set_request(ctxt->session, ctxt->sc->client_verify_mode);
-    }
-    
-    ret->cert.x509 = &ctxt->sc->cert_x509;
-    ret->key.x509 = ctxt->sc->privkey_x509;
-    return 0;
-}
-
-static mgs_handle_t* create_gnutls_handle(apr_pool_t* pool, conn_rec * c)
+static const int protocol_priority[] = {
+  GNUTLS_TLS1_1, GNUTLS_TLS1_0, GNUTLS_SSL3, 0 };
+          
+
+static mgs_handle_t *create_gnutls_handle(apr_pool_t * pool, conn_rec * c)
 {
     mgs_handle_t *ctxt;
     mgs_srvconf_rec *sc =
-        (mgs_srvconf_rec *) ap_get_module_config(c->base_server->
-                                                        module_config,
-                                                        &gnutls_module);
+        (mgs_srvconf_rec *) ap_get_module_config(c->base_server->
+                                                 module_config,
+                                                 &gnutls_module);
 
     ctxt = apr_pcalloc(pool, sizeof(*ctxt));
@@ -472 +559 @@
 
     gnutls_init(&ctxt->session, GNUTLS_SERVER);
-
-    gnutls_protocol_set_priority(ctxt->session, sc->protocol);
-    gnutls_cipher_set_priority(ctxt->session, sc->ciphers);
-    gnutls_compression_set_priority(ctxt->session, sc->compression);
-    gnutls_kx_set_priority(ctxt->session, sc->key_exchange);
-    gnutls_mac_set_priority(ctxt->session, sc->macs);
-    gnutls_certificate_type_set_priority(ctxt->session, sc->cert_types);
-
-    mgs_cache_session_init(ctxt);
     
-    gnutls_credentials_set(ctxt->session, GNUTLS_CRD_CERTIFICATE, ctxt->sc->certs);
-
-    gnutls_certificate_server_set_retrieve_function(sc->certs, cert_retrieve_fn);
-    gnutls_certificate_server_set_request(ctxt->session, ctxt->sc->client_verify_mode);
+    /* This is not very good as it trades security for compatibility,
+     * but it is the only way to be ultra-portable.
+     */
+    gnutls_session_enable_compatibility_mode( ctxt->session);
+    
+    /* because we don't set any default priorities here (we set later at
+     * the user hello callback) we need to at least set this in order for
+     * gnutls to be able to read packets.
+     */
+    gnutls_protocol_set_priority( ctxt->session, protocol_priority);
+
+    gnutls_handshake_set_post_client_hello_function( ctxt->session, mgs_select_virtual_server_cb);
+
     return ctxt;
 }
@@ -493 +580 @@
     mgs_handle_t *ctxt;
     mgs_srvconf_rec *sc =
-        (mgs_srvconf_rec *) ap_get_module_config(c->base_server->
-                                                        module_config,
-                                                        &gnutls_module);
+        (mgs_srvconf_rec *) ap_get_module_config(c->base_server->
+                                                 module_config,
+                                                 &gnutls_module);
 
     if (!(sc && (sc->enabled == GNUTLS_ENABLED_TRUE))) {
-        return DECLINED;
+        return DECLINED;
     }
 
@@ -505 +592 @@
     ap_set_module_config(c->conn_config, &gnutls_module, ctxt);
 
-    gnutls_transport_set_pull_function(ctxt->session,
-                                       mgs_transport_read);
-    gnutls_transport_set_push_function(ctxt->session,
-                                       mgs_transport_write);
+    gnutls_transport_set_pull_function(ctxt->session, mgs_transport_read);
+    gnutls_transport_set_push_function(ctxt->session, mgs_transport_write);
     gnutls_transport_set_ptr(ctxt->session, ctxt);
-    
-    ctxt->input_filter = ap_add_input_filter(GNUTLS_INPUT_FILTER_NAME, ctxt, 
-                                             NULL, c);
-    ctxt->output_filter = ap_add_output_filter(GNUTLS_OUTPUT_FILTER_NAME, ctxt,
-                                               NULL, c);
+
+    ctxt->input_filter =
+        ap_add_input_filter(GNUTLS_INPUT_FILTER_NAME, ctxt, NULL, c);
+    ctxt->output_filter =
+        ap_add_output_filter(GNUTLS_OUTPUT_FILTER_NAME, ctxt, NULL, c);
 
     return OK;
 }
 
-int mgs_hook_fixups(request_rec *r)
+int mgs_hook_fixups(request_rec * r)
 {
     unsigned char sbuf[GNUTLS_MAX_SESSION_ID];
     char buf[AP_IOBUFSIZE];
-    const char* tmp;
-    int len;
+    const char *tmp;
+    size_t len;
     mgs_handle_t *ctxt;
     int rv = OK;
-    
+
     apr_table_t *env = r->subprocess_env;
 
-    ctxt = ap_get_module_config(r->connection->conn_config, &gnutls_module);
-
-    if(!ctxt) {
-        return DECLINED;
+    ctxt =
+        ap_get_module_config(r->connection->conn_config, &gnutls_module);
+
+    if (!ctxt) {
+        return DECLINED;
     }
 
     apr_table_setn(env, "HTTPS", "on");
 
-    apr_table_setn(env, "GNUTLS_VERSION_INTERFACE", MOD_GNUTLS_VERSION);
-    apr_table_setn(env, "GNUTLS_VERSION_LIBRARY", LIBGNUTLS_VERSION);
+    apr_table_setn(env, "SSL_VERSION_LIBRARY", "GnuTLS/"LIBGNUTLS_VERSION);
+    apr_table_setn(env, "SSL_VERSION_INTERFACE", "mod_gnutls/"MOD_GNUTLS_VERSION);
 
     apr_table_setn(env, "SSL_PROTOCOL",
-                   gnutls_protocol_get_name(gnutls_protocol_get_version(ctxt->session)));
-
+                   gnutls_protocol_get_name(gnutls_protocol_get_version
+                                            (ctxt->session)));
+
+    /* should have been called SSL_CIPHERSUITE instead */                                          
     apr_table_setn(env, "SSL_CIPHER",
-                   gnutls_cipher_get_name(gnutls_cipher_get(ctxt->session)));
-
-    apr_table_setn(env, "SSL_CLIENT_VERIFY", "NONE");
-
-    tmp = apr_psprintf(r->pool, "%d",
-              8 * gnutls_cipher_get_key_size(gnutls_cipher_get(ctxt->session)));
+          gnutls_cipher_suite_get_name(
+            gnutls_kx_get(ctxt->session), gnutls_cipher_get(ctxt->session),
+                    gnutls_mac_get(ctxt->session)));
+
+    apr_table_setn(env, "SSL_COMPRESS_METHOD",
+                   gnutls_compression_get_name(gnutls_compression_get
+                                          (ctxt->session)));
+
+    apr_table_setn(env, "SSL_SRP_USER",
+                   gnutls_srp_server_get_username( ctxt->session));
+
+    if (apr_table_get(env, "SSL_CLIENT_VERIFY") == NULL)
+        apr_table_setn(env, "SSL_CLIENT_VERIFY", "NONE");
+
+    unsigned int key_size =
+        8 * gnutls_cipher_get_key_size(gnutls_cipher_get(ctxt->session));
+    tmp = apr_psprintf(r->pool, "%u", key_size);
 
     apr_table_setn(env, "SSL_CIPHER_USEKEYSIZE", tmp);
 
     apr_table_setn(env, "SSL_CIPHER_ALGKEYSIZE", tmp);
+
+    apr_table_setn(env, "SSL_CIPHER_EXPORT",
+                   (key_size <= 40) ? "true" : "false");
 
     len = sizeof(sbuf);
@@ -561 +663 @@
     apr_table_setn(env, "SSL_SESSION_ID", apr_pstrdup(r->pool, tmp));
 
-    /* TODO: There are many other env vars that we need to add */
-    {
-        len = sizeof(buf);
-        gnutls_x509_crt_get_dn(ctxt->sc->cert_x509, buf, &len);
-        apr_table_setn(env, "SSL_SERVER_S_DN", apr_pstrmemdup(r->pool, buf, len));
-           
-        len = sizeof(buf);
-        gnutls_x509_crt_get_issuer_dn(ctxt->sc->cert_x509, buf, &len);
-        apr_table_setn(env, "SSL_SERVER_I_DN", apr_pstrmemdup(r->pool, buf, len));
-    }
+    mgs_add_common_cert_vars(r, ctxt->sc->cert_x509, 0, ctxt->sc->export_certificates_enabled);
+
     return rv;
 }
 
-int mgs_hook_authz(request_rec *r)
+int mgs_hook_authz(request_rec * r)
 {
     int rv;
-    int status;
     mgs_handle_t *ctxt;
     mgs_dirconf_rec *dc = ap_get_module_config(r->per_dir_config,
-                                                      &gnutls_module);
-    
-    ctxt = ap_get_module_config(r->connection->conn_config, &gnutls_module);
-    
+                                               &gnutls_module);
+
+    ctxt =
+        ap_get_module_config(r->connection->conn_config, &gnutls_module);
+
     if (!ctxt) {
-        return DECLINED;
+        return DECLINED;
     }
 
     if (dc->client_verify_mode == GNUTLS_CERT_IGNORE) {
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
-                      "GnuTLS: Directory set to Ignore Client Certificate!");
-    }
-    else {
-        if (ctxt->sc->client_verify_mode < dc->client_verify_mode) {
-            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
-                          "GnuTLS: Attempting to rehandshake with peer. %d %d",
-                          ctxt->sc->client_verify_mode, dc->client_verify_mode);
-        
-            gnutls_certificate_server_set_request(ctxt->session,
-                                              dc->client_verify_mode);
-    
-            if (mgs_rehandshake(ctxt) != 0) {
-                return HTTP_FORBIDDEN;
-            }
-        }
-        else if (ctxt->sc->client_verify_mode == GNUTLS_CERT_IGNORE) {
+        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+                      "GnuTLS: Directory set to Ignore Client Certificate!");
+    } else {
+        if (ctxt->sc->client_verify_mode < dc->client_verify_mode) {
+            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+                          "GnuTLS: Attempting to rehandshake with peer. %d %d",
+                          ctxt->sc->client_verify_mode,
+                          dc->client_verify_mode);
+
+            gnutls_certificate_server_set_request(ctxt->session,
+                                                  dc->client_verify_mode);
+
+            if (mgs_rehandshake(ctxt) != 0) {
+                return HTTP_FORBIDDEN;
+            }
+        } else if (ctxt->sc->client_verify_mode == GNUTLS_CERT_IGNORE) {
 #if MOD_GNUTLS_DEBUG
-        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, 
-                      "GnuTLS: Peer is set to IGNORE");
-#endif
-        }
-        else {
-            rv = mgs_cert_verify(r, ctxt);
-            if (rv != DECLINED) {
-                return rv;
-            }
-        }
-
-
-static int mgs_cert_verify(request_rec *r, mgs_handle_t *ctxt)
-{
-    const gnutls_datum_t* cert_list;
-    int cert_list_size;
+            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+                          "GnuTLS: Peer is set to IGNORE");
+#endif
+        } else {
+            rv = mgs_cert_verify(r, ctxt);
+            if (rv != DECLINED) {
+                return rv;
+            }
+        }
+    }
+
+    return DECLINED;
+}
+
+/* variables that are not sent by default:
+ *
+ * SSL_CLIENT_CERT      string  PEM-encoded client certificate
+ * SSL_SERVER_CERT      string  PEM-encoded client certificate
+ */
+
+/* side is either 0 for SERVER or 1 for CLIENT
+ */
+#define MGS_SIDE ((side==0)?"SSL_SERVER":"SSL_CLIENT")
+static void
+mgs_add_common_cert_vars(request_rec * r, gnutls_x509_crt cert, int side, int export_certificates_enabled)
+{
+    unsigned char sbuf[64];     /* buffer to hold serials */
+    char buf[AP_IOBUFSIZE];
+    const char *tmp;
+    size_t len;
+    int alg;
+
+    apr_table_t *env = r->subprocess_env;
+
+    if (export_certificates_enabled != 0) {
+      char cert_buf[10*1024];
+      len = sizeof(cert_buf);
+
+      if (gnutls_x509_crt_export(cert, GNUTLS_X509_FMT_PEM, cert_buf, &len) >= 0)
+        apr_table_setn(env, apr_pstrcat(r->pool, MGS_SIDE, "_CERT", NULL),
+                   apr_pstrmemdup(r->pool, cert_buf, len));
+      
+    }
+
+    len = sizeof(buf);
+    gnutls_x509_crt_get_dn(cert, buf, &len);
+    apr_table_setn(env, apr_pstrcat(r->pool, MGS_SIDE, "_S_DN", NULL),
+                   apr_pstrmemdup(r->pool, buf, len));
+
+    len = sizeof(buf);
+    gnutls_x509_crt_get_issuer_dn(cert, buf, &len);
+    apr_table_setn(env, apr_pstrcat(r->pool, MGS_SIDE, "_I_DN", NULL),
+                   apr_pstrmemdup(r->pool, buf, len));
+
+    len = sizeof(sbuf);
+    gnutls_x509_crt_get_serial(cert, sbuf, &len);
+    tmp = mgs_session_id2sz(sbuf, len, buf, sizeof(buf));
+    apr_table_setn(env, apr_pstrcat(r->pool, MGS_SIDE, "_M_SERIAL", NULL),
+                   apr_pstrdup(r->pool, tmp));
+
+    tmp =
+        mgs_time2sz(gnutls_x509_crt_get_expiration_time
+                    (cert), buf, sizeof(buf));
+    apr_table_setn(env, apr_pstrcat(r->pool, MGS_SIDE, "_V_END", NULL),
+                   apr_pstrdup(r->pool, tmp));
+
+    tmp =
+        mgs_time2sz(gnutls_x509_crt_get_activation_time
+                    (cert), buf, sizeof(buf));
+    apr_table_setn(env, apr_pstrcat(r->pool, MGS_SIDE, "_V_START", NULL),
+                   apr_pstrdup(r->pool, tmp));
+
+    alg = gnutls_x509_crt_get_signature_algorithm( cert);
+    if (alg >= 0) {
+      apr_table_setn(env, apr_pstrcat(r->pool, MGS_SIDE, "_A_SIG", NULL),
+          gnutls_sign_algorithm_get_name( alg));
+    }
+
+    alg = gnutls_x509_crt_get_pk_algorithm( cert, NULL);
+    if (alg >= 0) {
+      apr_table_setn(env, apr_pstrcat(r->pool, MGS_SIDE, "_A_KEY", NULL),
+          gnutls_pk_algorithm_get_name( alg));
+    }
+
+
+}
+
+
+static int mgs_cert_verify(request_rec * r, mgs_handle_t * ctxt)
+{
+    const gnutls_datum_t *cert_list;
+    unsigned int cert_list_size, status, expired;
+    int rv, ret;
     gnutls_x509_crt_t cert;
-
-
-    cert_list = gnutls_certificate_get_peers(ctxt->session, &cert_list_size);
+    apr_time_t activation_time, expiration_time, cur_time;
+
+    cert_list =
+        gnutls_certificate_get_peers(ctxt->session, &cert_list_size);
 
     if (cert_list == NULL || cert_list_size == 0) {
-        /* no certificate provided by the client, but one was required. */
-        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, 
-                         "GnuTLS: Failed to Verify Peer: "
-                         "Client did not submit a certificate");
-        return HTTP_FORBIDDEN;
+        /* It is perfectly OK for a client not to send a certificate if on REQUEST mode
+         */
+        if (ctxt->sc->client_verify_mode == GNUTLS_CERT_REQUEST)
+            return OK;
+
+        /* no certificate provided by the client, but one was required. */
+        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+                      "GnuTLS: Failed to Verify Peer: "
+                      "Client did not submit a certificate");
+        return HTTP_FORBIDDEN;
     }
 
     if (cert_list_size > 1) {
-        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, 
-                         "GnuTLS: Failed to Verify Peer: "
-                         "Chained Client Certificates are not supported.");
-        return HTTP_FORBIDDEN;
+        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+                      "GnuTLS: Failed to Verify Peer: "
+                      "Chained Client Certificates are not supported.");
+        return HTTP_FORBIDDEN;
     }
 
     gnutls_x509_crt_init(&cert);
-    gnutls_x509_crt_import(cert, &cert_chain[0], GNUTLS_X509_FMT_DER);
-
-    rv = gnutls_x509_crt_verify(cert, ctxt->sc->ca_list, ctxt->sc->ca_list_size, 0, &status);
-
+    rv = gnutls_x509_crt_import(cert, &cert_list[0], GNUTLS_X509_FMT_DER);
     if (rv < 0) {
-        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, 
-                     "GnuTLS: Failed to Verify Peer: (%d) %s", 
-                     rv, gnutls_strerror(rv));
-        return HTTP_FORBIDDEN;
-    }
-    
-        if (status < 0) {
-            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, 
-                         "GnuTLS: Peer Status is invalid."); 
-            return HTTP_FORBIDDEN;
-        }
-    
-        if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) {
-            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, 
-                         "GnuTLS: Could not find Signer for Peer Certificate"); 
-        }
-    
-        if (status & GNUTLS_CERT_SIGNER_NOT_CA) {
-            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, 
-                         "GnuTLS: Could not find CA for Peer Certificate"); 
-        }
-    
-        if (status & GNUTLS_CERT_INVALID) {
-            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, 
-                         "GnuTLS: Peer Certificate is invalid."); 
-            return HTTP_FORBIDDEN;
-        }
-        else if (status & GNUTLS_CERT_REVOKED) {
-            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, 
-                         "GnuTLS: Peer Certificate is revoked."); 
-            return HTTP_FORBIDDEN;
-        }
-    
-        /* TODO: OpenPGP Certificates */
-        if (gnutls_certificate_type_get(ctxt->session) != GNUTLS_CRT_X509) {
-            ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, 
-                         "GnuTLS: Only x509 is supported for client certificates");         
-            return HTTP_FORBIDDEN;
-        }
-        /* TODO: Further Verification. */
-//        gnutls_x509_crt_get_expiration_time() < time 
-//        gnutls_x509_crt_get_activation_time() > time
+        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+                      "GnuTLS: Failed to Verify Peer: "
+                      "Failed to import peer certificates.");
+        ret = HTTP_FORBIDDEN;
+        goto exit;
+    }
+
+    apr_time_ansi_put(&expiration_time,
+                      gnutls_x509_crt_get_expiration_time(cert));
+    apr_time_ansi_put(&activation_time,
+                      gnutls_x509_crt_get_activation_time(cert));
+
+    rv = gnutls_x509_crt_verify(cert, ctxt->sc->ca_list,
+                                ctxt->sc->ca_list_size, 0, &status);
+
+    if (rv < 0) {
+        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+                      "GnuTLS: Failed to Verify Peer certificate: (%d) %s",
+                      rv, gnutls_strerror(rv));
+        ret = HTTP_FORBIDDEN;
+        goto exit;
+    }
+
+    expired = 0;
+    cur_time = apr_time_now();
+    if (activation_time > cur_time) {
+        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+                      "GnuTLS: Failed to Verify Peer: "
+                      "Peer Certificate is not yet activated.");
+        expired = 1;
+    }
+
+    if (expiration_time < cur_time) {
+        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+                      "GnuTLS: Failed to Verify Peer: "
+                      "Peer Certificate is expired.");
+        expired = 1;
+    }
+
+    if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) {
+        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+                      "GnuTLS: Could not find Signer for Peer Certificate");
+    }
+
+    if (status & GNUTLS_CERT_SIGNER_NOT_CA) {
+        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+                      "GnuTLS: Peer's Certificate signer is not a CA");
+    }
+
+    if (status & GNUTLS_CERT_INVALID) {
+        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+                      "GnuTLS: Peer Certificate is invalid.");
+    } else if (status & GNUTLS_CERT_REVOKED) {
+        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+                      "GnuTLS: Peer Certificate is revoked.");
+    }
+
+    /* TODO: Further Verification. */
+    /* Revocation is X.509 non workable paradigm, I really doubt implementation
+     * is worth doing --nmav
+     */
 /// ret = gnutls_x509_crt_check_revocation(crt, crl_list, crl_list_size);
-        ap_log_rerror(APLOG_MARK, APLOG_CRIT, 0, r, 
-                 "GnuTLS: Verified Peer.");     
-    }
-
-    ap_add_common_vars(r);
-    mgs_hook_fixups(r);
-    status = mgs_authz_lua(r);
-
-    if (status != 0) {
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, 
-                      "GnuTLS: FAILED Authorization Test");
-        return HTTP_FORBIDDEN;
-    }
-
-}
-
+
+//    mgs_hook_fixups(r);
+//    rv = mgs_authz_lua(r);
+
+    mgs_add_common_cert_vars(r, cert, 1, ctxt->sc->export_certificates_enabled);
+
+    {
+      /* days remaining */
+      unsigned long remain = (apr_time_sec(expiration_time) - apr_time_sec(cur_time))/86400;
+      apr_table_setn(r->subprocess_env, "SSL_CLIENT_V_REMAIN", 
+          apr_psprintf(r->pool, "%lu", remain));
+    }
+
+    if (status == 0 && expired == 0) {
+        apr_table_setn(r->subprocess_env, "SSL_CLIENT_VERIFY", "SUCCESS");
+        ret = OK;
+    } else {
+        apr_table_setn(r->subprocess_env, "SSL_CLIENT_VERIFY", "FAILED");
+        if (ctxt->sc->client_verify_mode == GNUTLS_CERT_REQUEST)
+            ret = OK;
+        else
+            ret = HTTP_FORBIDDEN;
+    }
+
+  exit:
+    gnutls_x509_crt_deinit(cert);
+    return ret;
+
+
+}

src/gnutls_io.c

@@ -544 +544 @@
         if (AP_BUCKET_IS_EOC(bucket)) {
             do {
-                ret = gnutls_alert_send(ctxt->session, GNUTLS_AL_FATAL,
-                                        GNUTLS_A_CLOSE_NOTIFY);
+                ret = gnutls_bye( ctxt->session, GNUTLS_SHUT_WR);
             } while(ret == GNUTLS_E_INTERRUPTED || ret == GNUTLS_E_AGAIN);
 
@@ -557 +556 @@
 
             apr_brigade_cleanup(ctxt->output_bb);
-            gnutls_bye(ctxt->session, GNUTLS_SHUT_WR);
             gnutls_deinit(ctxt->session);
             continue;
@@ -569 +567 @@
                 return status;
             }
+
             apr_brigade_cleanup(ctxt->output_bb);
             continue;
@@ -600 +599 @@
                              ctxt->c->base_server,
                              "GnuTLS: Error writing data."
-                             " (%d) '%s'", ret, gnutls_strerror(ret));
+                             " (%d) '%s'", (int)ret, gnutls_strerror(ret));
                 if (ctxt->output_rc == APR_SUCCESS) {
                     ctxt->output_rc = APR_EGENERAL;

src/mod_gnutls.c

@@ -64 +64 @@
                   NULL,
                   RSRC_CONF,
-                  "Set the CA File for Client Certificates"),
+                  "Set the CA File to verify Client Certificates"),
+    AP_INIT_TAKE1("GnuTLSDHFile", mgs_set_dh_file,
+                  NULL,
+                  RSRC_CONF,
+                  "Set the file to read Diffie Hellman parameters from"),
+    AP_INIT_TAKE1("GnuTLSRSAFile", mgs_set_rsa_export_file,
+                  NULL,
+                  RSRC_CONF,
+                  "Set the file to read RSA-EXPORT parameters from"),
     AP_INIT_TAKE1("GnuTLSCertificateFile", mgs_set_cert_file,
                   NULL,
@@ -72 +80 @@
                   NULL,
                   RSRC_CONF,
-                  "SSL Server Certificate file"),
+                  "SSL Server SRP Password file"),
+    AP_INIT_TAKE1("GnuTLSSRPPasswdFile", mgs_set_srp_tpasswd_file,
+                  NULL,
+                  RSRC_CONF,
+                  "SSL Server SRP Password Conf file"),
+    AP_INIT_TAKE1("GnuTLSSRPPasswdConfFile", mgs_set_srp_tpasswd_conf_file,
+                  NULL,
+                  RSRC_CONF,
+                  "SSL Server SRP Parameters file"),
     AP_INIT_TAKE1("GnuTLSCacheTimeout", mgs_set_cache_timeout,
                   NULL,
@@ -81 +97 @@
                   RSRC_CONF,
                   "Cache Configuration"),
+    AP_INIT_RAW_ARGS("GnuTLSPriorities", mgs_set_priorities,
+                  NULL,
+                  RSRC_CONF,
+                  "The priorities to enable (ciphers, Key exchange, macs, compression)"),
     AP_INIT_TAKE1("GnuTLSEnable", mgs_set_enabled,
                   NULL,
                   RSRC_CONF,
                   "Whether this server has GnuTLS Enabled. Default: Off"),
+    AP_INIT_TAKE1("GnuTLSExportCertificates", mgs_set_export_certificates_enabled,
+                  NULL,
+                  RSRC_CONF,
+                  "Whether to export PEM encoded certificates to CGIs. Default: Off"),
+#if 0
     AP_INIT_RAW_ARGS("<GnuTLSRequire", mgs_set_require_section,
                   NULL,
@@ -93 +118 @@
                      OR_ALL,
                      "Internal Command for reading Lua Bytecode."),
+#endif
     {NULL}
 };