summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2019-07-23 23:57:48 +0200
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2019-07-23 23:57:48 +0200
commitf01e72dec9b6e513a3e6fe21f128e76eee24b01d (patch)
tree517d1d27c6b217635368cee5af19d1fbebf4a3b2 /src
parentad488bdf1343d85a30d8189884018928b0f699ba (diff)
followup #5817
Diffstat (limited to 'src')
-rw-r--r--src/gns/gnunet-gns-proxy-setup-ca.in2
-rw-r--r--src/transport/gnunet-transport-certificate-creation.in7
2 files changed, 4 insertions, 5 deletions
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