error msg

[oweals/gnunet.git] / src / transport / gnunet-transport-certificate-creation.c

diff --git a/src/transport/gnunet-transport-certificate-creation.c b/src/transport/gnunet-transport-certificate-creation.c
index c8fa62cc79a5024104e354acb5923e641757c1b5..5ecc7de42c0f7f71156ca09bb054ae19bf8ac3b0 100644 (file)
--- a/src/transport/gnunet-transport-certificate-creation.c
+++ b/src/transport/gnunet-transport-certificate-creation.c
@@ -22,27 +22,29 @@
  * @file transport/gnunet-transport-certificate-creation.c
  * @brief create certificate for HTTPS transport
  * @author LRN
- *
  */
 #include "platform.h"
 #include "gnunet_disk_lib.h"
 #include "gnunet_os_lib.h"
 
 
-static void 
-removecerts (const char *file1, 
-            const char *file2)
+static void
+removecerts (const char *file1, const char *file2)
 {
-  if (GNUNET_DISK_file_test (file1) == GNUNET_YES)
-    {
-      CHMOD (file1, 0777);
-      REMOVE (file1);
-    }
-  if (GNUNET_DISK_file_test (file2) == GNUNET_YES)
-    {
-      CHMOD (file2, 0777);
-      REMOVE (file2);
-    }
+  if (GNUNET_YES == GNUNET_DISK_file_test (file1))
+  {
+    if (0 != CHMOD (file1, S_IWUSR | S_IRUSR))
+      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "chmod", file1);
+    if (0 != REMOVE (file1))
+      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "remove", file1);
+  }
+  if (GNUNET_YES == GNUNET_DISK_file_test (file2))
+  {
+    if (0 != CHMOD (file2, S_IWUSR | S_IRUSR))
+      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "chmod", file2);
+    if (0 != REMOVE (file2))
+      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "remove", file2);
+  }
 }
 
 
@@ -50,73 +52,35 @@ int
 main (int argc, char **argv)
 {
   struct GNUNET_OS_Process *openssl;
-  enum GNUNET_OS_ProcessStatusType status_type;
-  unsigned long code;
 
-  if (argc != 3)
+  if (3 != argc)
     return 1;
-
   removecerts (argv[1], argv[2]);
+  (void) close (2);                    /* eliminate stderr */
   /* Create RSA Private Key */
   /* openssl genrsa -out $1 1024 2> /dev/null */
-  openssl = GNUNET_OS_start_process (NULL, NULL,
-                                    "openssl", 
-                                    "openssl",
-                                    "genrsa", "-out", argv[1], "1024",
-                                    NULL);
-  if (openssl == NULL)
+  openssl =
+      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)
     return 2;
-  if (GNUNET_OS_process_wait (openssl) != GNUNET_OK)
-    {
-      GNUNET_OS_process_kill (openssl, SIGTERM);
-      removecerts (argv[1], argv[2]);
-      return 3;
-    }
-  if (GNUNET_OS_process_status (openssl, &status_type, &code) != GNUNET_OK)
-    {
-      GNUNET_OS_process_kill (openssl, SIGTERM);
-      removecerts (argv[1], argv[2]);
-      return 4;
-    }
-  if (status_type != GNUNET_OS_PROCESS_EXITED || code != 0)
-    {
-      GNUNET_OS_process_kill (openssl, SIGTERM);
-      removecerts (argv[1], argv[2]);
-      return 5;
-    }
-  GNUNET_OS_process_close (openssl);
-  
-  /* Create a self-signed certificate in batch mode using rsa key*/
+  GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (openssl));
+  GNUNET_OS_process_destroy (openssl);
+
+  /* Create a self-signed certificate in batch mode using rsa key */
   /* openssl req -batch -days 365 -out $2 -new -x509 -key $1 2> /dev/null */
-  openssl = GNUNET_OS_start_process (NULL, NULL, 
-                                    "openssl", 
-                                    "openssl", 
-                                    "req", "-batch", "-days", "365", 
-                                    "-out", argv[2], "-new", "-x509", "-key", argv[1], 
-                                    NULL);
-  if (openssl == NULL)
-    return 6;
-  if (GNUNET_OS_process_wait (openssl) != GNUNET_OK)
-    {
-      GNUNET_OS_process_kill (openssl, SIGTERM);
-      removecerts (argv[1], argv[2]);
-      return 7;
-    }
-  if (GNUNET_OS_process_status (openssl, &status_type, &code) != GNUNET_OK)
-    {
-      GNUNET_OS_process_kill (openssl, SIGTERM);
-      removecerts (argv[1], argv[2]);
-      return 8;
-    }
-  if (status_type != GNUNET_OS_PROCESS_EXITED || code != 0)
-    {
-      GNUNET_OS_process_kill (openssl, SIGTERM);
-      removecerts (argv[1], argv[2]);
-      return 9;
-    }
-  GNUNET_OS_process_close (openssl);
-  CHMOD (argv[1], 0400);
-  CHMOD (argv[2], 0400);
+  openssl =
+      GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "openssl", "openssl", "req",
+                               "-batch", "-days", "365", "-out", argv[2],
+                               "-new", "-x509", "-key", argv[1], NULL);
+  if (NULL == openssl)
+    return 3;
+  GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (openssl));
+  GNUNET_OS_process_destroy (openssl);
+  if (0 != CHMOD (argv[1], S_IRUSR))
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "chmod", argv[1]);
+  if (0 != CHMOD (argv[2], S_IRUSR))
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "chmod", argv[2]);
   return 0;
 }