- debug output decreased

- private keys and certs removed after all testcases

6 files changed, 223 insertions, 8 deletions

diff --git a/src/transport/plugin_transport_https.c b/src/transport/plugin_transport_https.c
index b7a9465b8..6cc9f9c7e 100644
--- a/src/transport/plugin_transport_https.c
+++ b/src/transport/plugin_transport_https.c
@@ -41,8 +41,8 @@
 #include "microhttpd.h"
 #include <curl/curl.h>
 
-#define DEBUG_HTTPS GNUNET_YES
-#define VERBOSE GNUNET_YES
+#define DEBUG_HTTPS GNUNET_NO
+#define VERBOSE GNUNET_NO
 #define DEBUG_CURL GNUNET_NO
 #define DEBUG_CONNECTIONS GNUNET_NO
 #define DEBUG_SESSION_SELECTION GNUNET_NO
diff --git a/src/transport/test_plugin_transport_https.c b/src/transport/test_plugin_transport_https.c
index e5c661ae9..32862913b 100644
--- a/src/transport/test_plugin_transport_https.c
+++ b/src/transport/test_plugin_transport_https.c
@@ -467,7 +467,6 @@ shutdown_clean ()
   GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_http");
 
   struct stat sbuf;
-
   if (0 == stat (cert_file, &sbuf ))
   {
           if (0 == remove(cert_file))
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index 04cf69bb8..46973e414 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -36,7 +36,7 @@
 #include "gnunet_transport_service.h"
 #include "transport.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
 
 #define VERBOSE_ARM GNUNET_NO
 
@@ -86,6 +86,12 @@ static int is_https;
 
 static  GNUNET_SCHEDULER_TaskIdentifier die_task;
 
+static char * key_file_p1;
+static char * cert_file_p1;
+
+static char * key_file_p2;
+static char * cert_file_p2;
+
 #if VERBOSE
 #define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
 #else
@@ -221,6 +227,63 @@ setup_peer (struct PeerContext *p, const char *cfgname)
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
 
+  if (is_https)
+  {
+          struct stat sbuf;
+          if (p==&p1)
+          {
+                  if (GNUNET_CONFIGURATION_have_value (p->cfg,
+                                                                                           "transport-https", "KEY_FILE"))
+                                GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "KEY_FILE", &key_file_p1);
+                  else
+                          GNUNET_asprintf(&key_file_p1,"https.key");
+                  if (0 == stat (key_file_p1, &sbuf ))
+                  {
+                          if (0 == remove(key_file_p1))
+                              GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Successfully removed existing private key file `%s'\n",key_file_p1);
+                          else
+                                  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove private key file `%s'\n",key_file_p1);
+                  }
+                  if (GNUNET_CONFIGURATION_have_value (p->cfg,"transport-https", "CERT_FILE"))
+                          GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "CERT_FILE", &cert_file_p1);
+                  else
+                          GNUNET_asprintf(&cert_file_p1,"https.cert");
+                  if (0 == stat (cert_file_p1, &sbuf ))
+                  {
+                          if (0 == remove(cert_file_p1))
+                              GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Successfully removed existing certificate file `%s'\n",cert_file_p1);
+                          else
+                                  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove existing certificate file `%s'\n",cert_file_p1);
+                  }
+          }
+          else if (p==&p2)
+          {
+                  if (GNUNET_CONFIGURATION_have_value (p->cfg,
+                                                                                           "transport-https", "KEY_FILE"))
+                                GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "KEY_FILE", &key_file_p2);
+                  else
+                          GNUNET_asprintf(&key_file_p2,"https.key");
+                  if (0 == stat (key_file_p2, &sbuf ))
+                  {
+                          if (0 == remove(key_file_p2))
+                              GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Successfully removed existing private key file `%s'\n",key_file_p2);
+                          else
+                                  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove private key file `%s'\n",key_file_p2);
+                  }
+                  if (GNUNET_CONFIGURATION_have_value (p->cfg,"transport-https", "CERT_FILE"))
+                          GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "CERT_FILE", &cert_file_p2);
+                  else
+                          GNUNET_asprintf(&cert_file_p2,"https.cert");
+                  if (0 == stat (cert_file_p2, &sbuf ))
+                  {
+                          if (0 == remove(cert_file_p2))
+                              GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Successfully removed existing certificate file `%s'\n",cert_file_p2);
+                          else
+                                  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove existing certificate file `%s'\n",cert_file_p2);
+                  }
+          }
+  }
+
   p->th = GNUNET_TRANSPORT_connect (sched, p->cfg,
                                     NULL, p,
                                     &notify_receive,
@@ -311,10 +374,10 @@ run (void *cls,
       setup_peer (&p2, "test_transport_api_http_peer2.conf");
     }
   else if (is_https)
-    {
-      setup_peer (&p1, "test_transport_api_https_peer1.conf");
-      setup_peer (&p2, "test_transport_api_https_peer2.conf");
-    }
+        {
+          setup_peer (&p1, "test_transport_api_https_peer1.conf");
+          setup_peer (&p2, "test_transport_api_https_peer2.conf");
+        }
   GNUNET_assert(p1.th != NULL);
   GNUNET_assert(p2.th != NULL);
 
@@ -345,6 +408,46 @@ check ()
                       options, &run, &ok);
   stop_arm (&p1);
   stop_arm (&p2);
+
+  if (is_https)
+  {
+          struct stat sbuf;
+          if (0 == stat (cert_file_p1, &sbuf ))
+          {
+                  if (0 == remove(cert_file_p1))
+                          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully removed existing certificate file `%s'\n",cert_file_p1);
+                  else
+                          GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove certfile `%s'\n",cert_file_p1);
+          }
+
+          if (0 == stat (key_file_p1, &sbuf ))
+          {
+                  if (0 == remove(key_file_p1))
+                          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully removed private key file `%s'\n",key_file_p1);
+                  else
+                          GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to private key file `%s'\n",key_file_p1);
+          }
+
+          if (0 == stat (cert_file_p2, &sbuf ))
+          {
+                  if (0 == remove(cert_file_p2))
+                          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully removed existing certificate file `%s'\n",cert_file_p2);
+                  else
+                          GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove certfile `%s'\n",cert_file_p2);
+          }
+
+          if (0 == stat (key_file_p2, &sbuf ))
+          {
+                  if (0 == remove(key_file_p2))
+                          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully removed private key file `%s'\n",key_file_p2);
+                  else
+                          GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to private key file `%s'\n",key_file_p2);
+          }
+          GNUNET_free(key_file_p1);
+          GNUNET_free(key_file_p2);
+          GNUNET_free(cert_file_p1);
+          GNUNET_free(cert_file_p2);
+  }
   return ok;
 }
 
diff --git a/src/transport/test_transport_api_rel_https_peer1.conf b/src/transport/test_transport_api_rel_https_peer1.conf
index 40aef0f04..0ee8fe99d 100644
--- a/src/transport/test_transport_api_rel_https_peer1.conf
+++ b/src/transport/test_transport_api_rel_https_peer1.conf
@@ -13,6 +13,9 @@ USE_IPv4 = YES
 USE_IPv6 = NO
 BINDTO4 = 127.0.0.1
 #BINDTO6 = ::1
+KEY_FILE = https_key_p1.key
+CERT_FILE = https_cert_p1.crt
+
 
 [fs]
 AUTOSTART = NO
diff --git a/src/transport/test_transport_api_rel_https_peer2.conf b/src/transport/test_transport_api_rel_https_peer2.conf
index 978234c90..f20366262 100644
--- a/src/transport/test_transport_api_rel_https_peer2.conf
+++ b/src/transport/test_transport_api_rel_https_peer2.conf
@@ -13,6 +13,9 @@ USE_IPv4 = YES
 USE_IPv6 = NO
 BINDTO4 = 127.0.0.1
 #BINDTO6 = ::1
+KEY_FILE = https_key_p2.key
+CERT_FILE = https_cert_p2.crt
+
 
 [fs]
 AUTOSTART = NO
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index 3e22299de..a18175bf4 100644
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -92,6 +92,13 @@ static struct GNUNET_TIME_Absolute start_time;
 
 static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
+static char * key_file_p1;
+static char * cert_file_p1;
+
+static char * key_file_p2;
+static char * cert_file_p2;
+
+
 #if VERBOSE
 #define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
 #else
@@ -120,6 +127,7 @@ end ()
            "\nThroughput was %llu kb/s\n",
            total_bytes * 1000 / 1024 / delta);
   ok = 0;
+
 }
 
 
@@ -369,6 +377,64 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                                         "-c", cfgname, NULL);
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
+
+  if (is_https)
+  {
+          struct stat sbuf;
+          if (p==&p1)
+          {
+                  if (GNUNET_CONFIGURATION_have_value (p->cfg,
+                                                                                           "transport-https", "KEY_FILE"))
+                                GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "KEY_FILE", &key_file_p1);
+                  else
+                          GNUNET_asprintf(&key_file_p1,"https.key");
+                  if (0 == stat (key_file_p1, &sbuf ))
+                  {
+                          if (0 == remove(key_file_p1))
+                              GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Successfully removed existing private key file `%s'\n",key_file_p1);
+                          else
+                                  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove private key file `%s'\n",key_file_p1);
+                  }
+                  if (GNUNET_CONFIGURATION_have_value (p->cfg,"transport-https", "CERT_FILE"))
+                          GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "CERT_FILE", &cert_file_p1);
+                  else
+                          GNUNET_asprintf(&cert_file_p1,"https.cert");
+                  if (0 == stat (cert_file_p1, &sbuf ))
+                  {
+                          if (0 == remove(cert_file_p1))
+                              GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Successfully removed existing certificate file `%s'\n",cert_file_p1);
+                          else
+                                  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove existing certificate file `%s'\n",cert_file_p1);
+                  }
+          }
+          else if (p==&p2)
+          {
+                  if (GNUNET_CONFIGURATION_have_value (p->cfg,
+                                                                                           "transport-https", "KEY_FILE"))
+                                GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "KEY_FILE", &key_file_p2);
+                  else
+                          GNUNET_asprintf(&key_file_p2,"https.key");
+                  if (0 == stat (key_file_p2, &sbuf ))
+                  {
+                          if (0 == remove(key_file_p2))
+                              GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Successfully removed existing private key file `%s'\n",key_file_p2);
+                          else
+                                  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove private key file `%s'\n",key_file_p2);
+                  }
+                  if (GNUNET_CONFIGURATION_have_value (p->cfg,"transport-https", "CERT_FILE"))
+                          GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "CERT_FILE", &cert_file_p2);
+                  else
+                          GNUNET_asprintf(&cert_file_p2,"https.cert");
+                  if (0 == stat (cert_file_p2, &sbuf ))
+                  {
+                          if (0 == remove(cert_file_p2))
+                              GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Successfully removed existing certificate file `%s'\n",cert_file_p2);
+                          else
+                                  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove existing certificate file `%s'\n",cert_file_p2);
+                  }
+          }
+  }
+
   p->th = GNUNET_TRANSPORT_connect (sched, p->cfg, NULL,
                                     p,
                                     &notify_receive,
@@ -499,6 +565,47 @@ check ()
                       options, &run, &ok);
   stop_arm (&p1);
   stop_arm (&p2);
+
+  if (is_https)
+  {
+          struct stat sbuf;
+          if (0 == stat (cert_file_p1, &sbuf ))
+          {
+                  if (0 == remove(cert_file_p1))
+                          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully removed existing certificate file `%s'\n",cert_file_p1);
+                  else
+                          GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove certfile `%s'\n",cert_file_p1);
+          }
+
+          if (0 == stat (key_file_p1, &sbuf ))
+          {
+                  if (0 == remove(key_file_p1))
+                          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully removed private key file `%s'\n",key_file_p1);
+                  else
+                          GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to private key file `%s'\n",key_file_p1);
+          }
+
+          if (0 == stat (cert_file_p2, &sbuf ))
+          {
+                  if (0 == remove(cert_file_p2))
+                          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully removed existing certificate file `%s'\n",cert_file_p2);
+                  else
+                          GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove certfile `%s'\n",cert_file_p2);
+          }
+
+          if (0 == stat (key_file_p2, &sbuf ))
+          {
+                  if (0 == remove(key_file_p2))
+                          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully removed private key file `%s'\n",key_file_p2);
+                  else
+                          GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to private key file `%s'\n",key_file_p2);
+          }
+          GNUNET_free(key_file_p1);
+          GNUNET_free(key_file_p2);
+          GNUNET_free(cert_file_p1);
+          GNUNET_free(cert_file_p2);
+  }
+
   return ok;
 }