From: Schanzenbach, Martin <mschanzenbach@posteo.de>
Date: Tue, 23 Jul 2019 21:57:48 +0000 (+0200)
Subject: followup #5817
X-Git-Tag: v0.11.6~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f01e72dec9b6e513a3e6fe21f128e76eee24b01d;p=oweals%2Fgnunet.git

followup #5817
---

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3e36eef07..f363cc68a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -405,7 +405,6 @@ src/transport/gnunet-service-transport_manipulation.c
 src/transport/gnunet-service-transport_neighbours.c
 src/transport/gnunet-service-transport_plugins.c
 src/transport/gnunet-service-transport_validation.c
-src/transport/gnunet-transport-certificate-creation.c
 src/transport/gnunet-transport-profiler.c
 src/transport/gnunet-transport-wlan-receiver.c
 src/transport/gnunet-transport-wlan-sender.c
diff --git a/src/gns/gnunet-gns-proxy-setup-ca.in b/src/gns/gnunet-gns-proxy-setup-ca.in
index 57d1a9f04..885fc069a 100644
--- a/src/gns/gnunet-gns-proxy-setup-ca.in
+++ b/src/gns/gnunet-gns-proxy-setup-ca.in
@@ -145,7 +145,7 @@ generate_ca()
         warningmsg "'gnutls-certtool' or 'certtool' command not found. Trying openssl."
         if test -z "`openssl version`" > /dev/null
         then
-          $OPENSSL=1
+          OPENSSL=1
         else
           warningmsg "Install either gnutls certtool or openssl for certificate generation!"
           infomsg    "Cleaning up."
diff --git a/src/transport/gnunet-transport-certificate-creation.in b/src/transport/gnunet-transport-certificate-creation.in
index 9b8a23594..1c04089a4 100644
--- a/src/transport/gnunet-transport-certificate-creation.in
+++ b/src/transport/gnunet-transport-certificate-creation.in
@@ -107,13 +107,12 @@ generate_cert_key()
     OPENSSL=0
     if test -z "`gnutls-certtool --version`" > /dev/null
     then
-      warningmsg "'gnutls-certtool' or 'certtool' command not found. Trying openssl."
       if test -z "`openssl version`" > /dev/null
       then
-        $OPENSSL=1
-      else
         warningmsg "Install either gnutls certtool or openssl for certificate generation!"
         exit 1
+      else
+        OPENSSL=1
       fi
       CERTTOOL="openssl"
     else
@@ -124,7 +123,7 @@ generate_cert_key()
     if test 1 -eq $OPENSSL
     then
       $CERTTOOL genrsa -out $KEYFILE 1024
-      $CERTTOOL req -batch -days 365 -out $CERTFILE, -new -x509 -key $KEYFILE
+      $CERTTOOL req -batch -days 365 -out $CERTFILE -new -x509 -key $KEYFILE
     else
       $CERTTOOL --generate-privkey --outfile $KEYFILE 2>/dev/null
       $CERTTOOL --template $GNUTLS_CA_TEMPLATE --generate-self-signed --load-privkey $KEYFILE --outfile $CERTFILE 2>/dev/null