[GNUnet-SVN] r12368 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2010-07-28 09:35:34 +0200 (Wed, 28 Jul 2010)
New Revision: 12368

Modified:
   gnunet/src/transport/plugin_transport_https.c
Log:
Improved tls certificate creation in https plugin


Modified: gnunet/src/transport/plugin_transport_https.c
===================================================================
--- gnunet/src/transport/plugin_transport_https.c       2010-07-28 07:19:51 UTC 
(rev 12367)
+++ gnunet/src/transport/plugin_transport_https.c       2010-07-28 07:35:34 UTC 
(rev 12368)
@@ -2515,9 +2515,24 @@
   if ((plugin->key==NULL) || (plugin->cert==NULL))
   {
          char * cmd;
+         int ret = 0;
          GNUNET_asprintf(&cmd,"gnunet-transport-certificate-creation %s %s", 
key_file, cert_file);
          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No usable TLS certificate 
found, creating certificate \n");
-         system(cmd);
+         ret = system(cmd);
+
+         if (ret != 0)
+         {
+                 GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+                                          "https",
+                                                  _("Could not create a new 
TLS certificate, shell script `%s' failed!\n"),cmd,
+                                                  "transport-https");
+                 GNUNET_free (key_file);
+                 GNUNET_free (cert_file);
+                 libgnunet_plugin_transport_https_done(api);
+                 GNUNET_free (cmd);
+                 return NULL;
+         }
+
          GNUNET_free (cmd);
 
          plugin->key = load_certificate( key_file );
@@ -2525,7 +2540,10 @@
 
          if ((plugin->key==NULL) || (plugin->cert==NULL))
          {
-                 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No usable TLS 
certificate found and creating one failed! \n");
+                 GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+                                          "https",
+                                                  _("No usable TLS certificate 
found and creating one failed! \n"),
+                                                  "transport-https");
                  GNUNET_free (key_file);
                  GNUNET_free (cert_file);
                  libgnunet_plugin_transport_https_done(api);