diff options
Diffstat (limited to 'src/transport/gnunet-transport-certificate-creation.c')
| -rw-r--r-- | src/transport/gnunet-transport-certificate-creation.c | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/src/transport/gnunet-transport-certificate-creation.c b/src/transport/gnunet-transport-certificate-creation.c index c4c13dc..5ecc7de 100644 --- a/src/transport/gnunet-transport-certificate-creation.c +++ b/src/transport/gnunet-transport-certificate-creation.c @@ -22,7 +22,6 @@ * @file transport/gnunet-transport-certificate-creation.c * @brief create certificate for HTTPS transport * @author LRN - * */ #include "platform.h" #include "gnunet_disk_lib.h" @@ -32,15 +31,19 @@ static void removecerts (const char *file1, const char *file2) { - if (GNUNET_DISK_file_test (file1) == GNUNET_YES) + if (GNUNET_YES == GNUNET_DISK_file_test (file1)) { - CHMOD (file1, S_IWUSR | S_IRUSR); - REMOVE (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_DISK_file_test (file2) == GNUNET_YES) + if (GNUNET_YES == GNUNET_DISK_file_test (file2)) { - CHMOD (file2, S_IWUSR | S_IRUSR); - REMOVE (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,32 +53,34 @@ main (int argc, char **argv) { struct GNUNET_OS_Process *openssl; - if (argc != 3) + if (3 != argc) return 1; removecerts (argv[1], argv[2]); - close (2); /* eliminate stderr */ + (void) close (2); /* eliminate stderr */ /* Create RSA Private Key */ /* openssl genrsa -out $1 1024 2> /dev/null */ openssl = - GNUNET_OS_start_process (GNUNET_NO, NULL, NULL, "openssl", "openssl", "genrsa", + GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "openssl", "openssl", "genrsa", "-out", argv[1], "1024", NULL); - if (openssl == NULL) + if (NULL == openssl) return 2; - GNUNET_assert (GNUNET_OS_process_wait (openssl) == GNUNET_OK); + 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 (GNUNET_NO, NULL, NULL, "openssl", "openssl", "req", + 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 (openssl == NULL) + if (NULL == openssl) return 3; - GNUNET_assert (GNUNET_OS_process_wait (openssl) == GNUNET_OK); + GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (openssl)); GNUNET_OS_process_destroy (openssl); - CHMOD (argv[1], S_IRUSR); - CHMOD (argv[2], S_IRUSR); + 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; } |