Changeset 0314deb in mod_gnutls

Timestamp:

Dec 6, 2004, 1:07:15 AM (15 years ago)

Author:

Paul Querna <chip@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, msva, upstream

Children:

32f2e60

Parents:

0b3bc05

Message:

re-order the cipher types.
Add a fixups hook and some Basic Env vars

File:

• src/mod_gnutls.c (modified) (4 diffs)

src/mod_gnutls.c

@@ -182 +182 @@
 }
 
+static int mod_gnutls_hook_fixups(request_rec *r)
+{
+    const char* tmp;
+    mod_gnutls_handle_t *ctxt;
+    apr_table_t *env = r->subprocess_env;
+
+    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, "SSL_PROTOCOL",
+                   gnutls_protocol_get_name(gnutls_protocol_get_version(ctxt->session)));
+    apr_table_setn(env, "SSL_CIPHER",
+                   gnutls_cipher_get_name(gnutls_cipher_get(ctxt->session)));
+
+    tmp = apr_psprintf(r->pool, "%d",
+              8 * gnutls_cipher_get_key_size(gnutls_cipher_get(ctxt->session)));
+
+    apr_table_setn(env, "SSL_CIPHER_USEKEYSIZE", tmp);
+    apr_table_setn(env, "SSL_CIPHER_ALGKEYSIZE", tmp);
+
+    return OK;
+}
+
 static const char *gnutls_set_cert_file(cmd_parms * parms, void *dummy,
                                         const char *arg)
@@ -260 +286 @@
                        APR_HOOK_MIDDLE);
 
+    ap_hook_fixups(mod_gnutls_hook_fixups, NULL, NULL, APR_HOOK_MIDDLE);
+
     /* TODO: HTTP Upgrade Filter */
     /* ap_register_output_filter ("UPGRADE_FILTER", 
@@ -285 +313 @@
 
     i = 0;
-    sc->ciphers[i++] = GNUTLS_CIPHER_RIJNDAEL_128_CBC;
+    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;
@@ -300 +329 @@
 
     i = 0;
+    sc->macs[i++] = GNUTLS_MAC_SHA;
     sc->macs[i++] = GNUTLS_MAC_MD5;
-    sc->macs[i++] = GNUTLS_MAC_SHA;
     sc->macs[i++] = GNUTLS_MAC_RMD160;
     sc->macs[i] = 0;