Changeset 26b08fd in mod_gnutls for src

Timestamp:

Oct 1, 2008, 11:50:40 AM (12 years ago)

Author:

Nokis Mavrogiannopoulos <nmav@…>

Branches:

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

Children:

a208cd3

Parents:

4fb2b3c

git-author:

Nikos Mavrogiannopoulos <nmav@…> (10/01/08 11:50:40)

git-committer:

Nokis Mavrogiannopoulos <nmav@…> (10/01/08 11:50:40)

Message:

updated README file to account for openpgp keys --patch by Jack Bates

File:

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

src/gnutls_hooks.c

@@ -63 +63 @@
 int ret;
 
+#if MOD_GNUTLS_DEBUG
+    apr_file_open(&debug_log_fp, "/tmp/gnutls_debug",
+                  APR_APPEND | APR_WRITE | APR_CREATE, APR_OS_DEFAULT,
+                  pconf);
+
+    apr_file_printf(debug_log_fp, "%s: %d\n", __func__, __LINE__);
+
+    gnutls_global_set_log_level(9);
+    gnutls_global_set_log_function(gnutls_debug_log_all);
+    apr_file_printf(debug_log_fp, "gnutls: %s\n", gnutls_check_version(NULL));
+#endif
+
 #if APR_HAS_THREADS
     ap_mpm_query(AP_MPMQ_IS_THREADED, &mpm_is_threaded);
@@ -73 +85 @@
 
     if (gnutls_check_version(LIBGNUTLS_VERSION)==NULL) {
-        fprintf(stderr, "gnutls_check_version() failed. Required: gnutls-%s Found: gnutls-%s\n", 
+        apr_file_printf(debug_log_fp, "gnutls_check_version() failed. Required: gnutls-%s Found: gnutls-%s\n", 
           LIBGNUTLS_VERSION, gnutls_check_version(NULL));
         return -3;
@@ -80 +92 @@
     ret = gnutls_global_init();
     if (ret < 0) {
-        fprintf(stderr, "gnutls_global_init: %s\n", gnutls_strerror(ret));
+        apr_file_printf(debug_log_fp, "gnutls_global_init: %s\n", gnutls_strerror(ret));
         return -3;
     }
@@ -87 +99 @@
                               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);
-
-    gnutls_global_set_log_level(9);
-    gnutls_global_set_log_function(gnutls_debug_log_all);
-    apr_file_printf(debug_log_fp, "gnutls: %s\n", gnutls_check_version(NULL));
-#endif
 
     return OK;
@@ -106 +109 @@
     int ret;
     int cprio[2];
+
+    apr_file_printf(debug_log_fp, "%s: %d\n", __func__, __LINE__);
 
     ctxt = gnutls_transport_get_ptr(session);
@@ -163 +168 @@
     mgs_handle_t *ctxt;
 
+    apr_file_printf(debug_log_fp, "%s: %d\n", __func__, __LINE__);
     ctxt = gnutls_transport_get_ptr(session);
 
@@ -214 +220 @@
 
 
+    apr_file_printf(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
     *cert_cn = NULL;
 
@@ -265 +272 @@
 
 
+    apr_file_printf(debug_log_fp, "%s: %d\n", __func__, __LINE__);
     *cert_cn = NULL;
 
@@ -297 +305 @@
     const char *userdata_key = "mgs_init";
 
+    apr_file_printf(debug_log_fp, "%s: %d\n", __func__, __LINE__);
     apr_pool_userdata_get(&data, userdata_key, base_server->process->pool);
     if (data == NULL) {
@@ -443 +452 @@
                                                &gnutls_module);
 
+    apr_file_printf(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
     if (sc->cache_type != mgs_cache_none) {
         rv = mgs_cache_child_init(p, s, sc);
@@ -461 +471 @@
                                                  &gnutls_module);
 
+    apr_file_printf(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
     if (sc->enabled == GNUTLS_ENABLED_FALSE) {
         return NULL;
@@ -474 +485 @@
                                                  &gnutls_module);
 
+    apr_file_printf(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
     if (sc->enabled == GNUTLS_ENABLED_FALSE) {
         return 0;
@@ -495 +507 @@
     vhost_cb_rec *x = baton;
 
+    apr_file_printf(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
     tsc = (mgs_srvconf_rec *) ap_get_module_config(s->module_config,
                                                    &gnutls_module);
@@ -547 +560 @@
 #endif
 
+    apr_file_printf(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
     ctxt = gnutls_transport_get_ptr(session);
 
@@ -624 +638 @@
                                                  &gnutls_module);
 
+    apr_file_printf(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
     ctxt = apr_pcalloc(pool, sizeof(*ctxt));
     ctxt->c = c;
@@ -662 +677 @@
                                                  &gnutls_module);
 
+    apr_file_printf(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
     if (!(sc && (sc->enabled == GNUTLS_ENABLED_TRUE))) {
         return DECLINED;
@@ -691 +707 @@
     int rv = OK;
 
+    apr_file_printf(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
     apr_table_t *env = r->subprocess_env;
 
@@ -765 +782 @@
                                                &gnutls_module);
 
+    apr_file_printf(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
     ctxt =
         ap_get_module_config(r->connection->conn_config, &gnutls_module);
@@ -826 +844 @@
     apr_table_t *env = r->subprocess_env;
 
+    apr_file_printf(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
     if (export_certificates_enabled != 0) {
         char cert_buf[10 * 1024];
@@ -932 +951 @@
     int ret;
 
+    apr_file_printf(debug_log_fp,   "%s: %d\n", __func__, __LINE__);
     apr_table_t *env = r->subprocess_env;
 
@@ -998 +1018 @@
     apr_time_t activation_time, expiration_time, cur_time;
 
+    apr_file_printf(debug_log_fp, "%s: %d\n", __func__, __LINE__);
     cert_list =
         gnutls_certificate_get_peers(ctxt->session, &cert_list_size);