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

[gnunet]

Author: grothoff
Date: 2013-08-25 11:19:08 +0200 (Sun, 25 Aug 2013)
New Revision: 28854

Modified:
   gnunet/src/transport/gnunet-transport-certificate-creation.c
Log:
-report error if starting openssl failed

Modified: gnunet/src/transport/gnunet-transport-certificate-creation.c
===================================================================
--- gnunet/src/transport/gnunet-transport-certificate-creation.c        
2013-08-25 09:10:23 UTC (rev 28853)
+++ gnunet/src/transport/gnunet-transport-certificate-creation.c        
2013-08-25 09:19:08 UTC (rev 28854)
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2011 Christian Grothoff (and other contributing authors)
+     (C) 2011, 2013 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -24,12 +24,12 @@
  * @author LRN
  */
 #include "platform.h"
-#include "gnunet_disk_lib.h"
-#include "gnunet_os_lib.h"
+#include "gnunet_util_lib.h"
 
 
 static void
-removecerts (const char *file1, const char *file2)
+removecerts (const char *file1, 
+            const char *file2)
 {
   if (GNUNET_YES == GNUNET_DISK_file_test (file1))
   {
@@ -54,7 +54,11 @@
   struct GNUNET_OS_Process *openssl;
 
   if (3 != argc)
+  {
+    fprintf (stderr, 
+            "Invalid arguments.\n");
     return 1;
+  }
   removecerts (argv[1], argv[2]);
   (void) close (2);                    /* eliminate stderr */
   /* Create RSA Private Key */
@@ -63,7 +67,11 @@
       GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, 
NULL, NULL, "openssl", "openssl", "genrsa",
                                "-out", argv[1], "1024", NULL);
   if (NULL == openssl)
+  {
+    fprintf (stderr, 
+            "Failed to run openssl.  Is openssl installed?\n");
     return 2;
+  }
   GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (openssl));
   GNUNET_OS_process_destroy (openssl);
 
@@ -74,7 +82,11 @@
                                "-batch", "-days", "365", "-out", argv[2],
                                "-new", "-x509", "-key", argv[1], NULL);
   if (NULL == openssl)
+  {
+    fprintf (stderr, 
+            "Failed to create self-signed certificate with openssl.\n");
     return 3;
+  }
   GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (openssl));
   GNUNET_OS_process_destroy (openssl);
   if (0 != CHMOD (argv[1], S_IRUSR))