From a67bfb413b9da0ebaedc66caf7fe458771680601 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 1 Aug 2011 21:05:00 +0000 Subject: [PATCH] style --- src/include/gnunet_disk_lib.h | 5 +- .../gnunet-transport-certificate-creation.c | 159 +++++++++--------- 2 files changed, 86 insertions(+), 78 deletions(-) diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h index 383a9daa2..5403d256b 100644 --- a/src/include/gnunet_disk_lib.h +++ b/src/include/gnunet_disk_lib.h @@ -572,8 +572,9 @@ GNUNET_DISK_file_lock (struct GNUNET_DISK_FileHandle *fh, off_t lockStart, * @return GNUNET_OK on success, GNUNET_SYSERR on error */ int -GNUNET_DISK_file_unlock (struct GNUNET_DISK_FileHandle *fh, off_t unlockStart, - off_t unlockEnd); +GNUNET_DISK_file_unlock (struct GNUNET_DISK_FileHandle *fh, + off_t unlockStart, + off_t unlockEnd); /** diff --git a/src/transport/gnunet-transport-certificate-creation.c b/src/transport/gnunet-transport-certificate-creation.c index 1256b93ba..c8fa62cc7 100644 --- a/src/transport/gnunet-transport-certificate-creation.c +++ b/src/transport/gnunet-transport-certificate-creation.c @@ -1,25 +1,51 @@ +/* + This file is part of GNUnet. + (C) 2011 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 + by the Free Software Foundation; either version 3, or (at your + option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GNUnet; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. +*/ + +/** + * @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" -/* GNUnet TLS certificate shell scricpt - Creates a TSL certificate to use with HTTPS transport plugin -*/ -void removecerts (char *file1, char *file2) +static void +removecerts (const char *file1, + const char *file2) { if (GNUNET_DISK_file_test (file1) == GNUNET_YES) - { - CHMOD (file1, 0777); - REMOVE (file1); - } + { + CHMOD (file1, 0777); + REMOVE (file1); + } if (GNUNET_DISK_file_test (file2) == GNUNET_YES) - { - CHMOD (file2, 0777); - REMOVE (file2); - } + { + CHMOD (file2, 0777); + REMOVE (file2); + } } + int main (int argc, char **argv) { @@ -27,90 +53,71 @@ main (int argc, char **argv) enum GNUNET_OS_ProcessStatusType status_type; unsigned long code; -/* -if [ $# -ne 2 ]; then - exit 1 -fi -*/ if (argc != 3) return 1; -/* -rm -f $1 $2 -*/ removecerts (argv[1], argv[2]); /* 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 [ $? -ne 0 ]; then - rm -f $1 $2 - exit 1 -fi -*/ + /* 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) return 2; if (GNUNET_OS_process_wait (openssl) != GNUNET_OK) - { - GNUNET_OS_process_kill (openssl, SIGTERM); - removecerts (argv[1], argv[2]); - return 3; - } + { + 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; - } + { + 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_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*/ -/* - 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 [ $? -ne 0 ]; then - rm -f $1 $2 - exit 1 -fi -*/ + /* 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; - } + { + 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; - } + { + 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_kill (openssl, SIGTERM); + removecerts (argv[1], argv[2]); + return 9; + } GNUNET_OS_process_close (openssl); -/* -chmod 0400 $1 $2 -*/ CHMOD (argv[1], 0400); CHMOD (argv[2], 0400); -/* -exit 0 -*/ return 0; } + +/* end of gnunet-transport-certificate-creation.c */ -- 2.25.1