diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-07-23 23:57:48 +0200 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-07-23 23:57:48 +0200 |
commit | f01e72dec9b6e513a3e6fe21f128e76eee24b01d (patch) | |
tree | 517d1d27c6b217635368cee5af19d1fbebf4a3b2 | |
parent | ad488bdf1343d85a30d8189884018928b0f699ba (diff) | |
download | gnunet-f01e72dec9b6e513a3e6fe21f128e76eee24b01d.tar.gz gnunet-f01e72dec9b6e513a3e6fe21f128e76eee24b01d.zip |
followup #5817
-rw-r--r-- | po/POTFILES.in | 1 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy-setup-ca.in | 2 | ||||
-rw-r--r-- | src/transport/gnunet-transport-certificate-creation.in | 7 |
3 files changed, 4 insertions, 6 deletions
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 | |||
405 | src/transport/gnunet-service-transport_neighbours.c | 405 | src/transport/gnunet-service-transport_neighbours.c |
406 | src/transport/gnunet-service-transport_plugins.c | 406 | src/transport/gnunet-service-transport_plugins.c |
407 | src/transport/gnunet-service-transport_validation.c | 407 | src/transport/gnunet-service-transport_validation.c |
408 | src/transport/gnunet-transport-certificate-creation.c | ||
409 | src/transport/gnunet-transport-profiler.c | 408 | src/transport/gnunet-transport-profiler.c |
410 | src/transport/gnunet-transport-wlan-receiver.c | 409 | src/transport/gnunet-transport-wlan-receiver.c |
411 | src/transport/gnunet-transport-wlan-sender.c | 410 | 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() | |||
145 | warningmsg "'gnutls-certtool' or 'certtool' command not found. Trying openssl." | 145 | warningmsg "'gnutls-certtool' or 'certtool' command not found. Trying openssl." |
146 | if test -z "`openssl version`" > /dev/null | 146 | if test -z "`openssl version`" > /dev/null |
147 | then | 147 | then |
148 | $OPENSSL=1 | 148 | OPENSSL=1 |
149 | else | 149 | else |
150 | warningmsg "Install either gnutls certtool or openssl for certificate generation!" | 150 | warningmsg "Install either gnutls certtool or openssl for certificate generation!" |
151 | infomsg "Cleaning up." | 151 | 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() | |||
107 | OPENSSL=0 | 107 | OPENSSL=0 |
108 | if test -z "`gnutls-certtool --version`" > /dev/null | 108 | if test -z "`gnutls-certtool --version`" > /dev/null |
109 | then | 109 | then |
110 | warningmsg "'gnutls-certtool' or 'certtool' command not found. Trying openssl." | ||
111 | if test -z "`openssl version`" > /dev/null | 110 | if test -z "`openssl version`" > /dev/null |
112 | then | 111 | then |
113 | $OPENSSL=1 | ||
114 | else | ||
115 | warningmsg "Install either gnutls certtool or openssl for certificate generation!" | 112 | warningmsg "Install either gnutls certtool or openssl for certificate generation!" |
116 | exit 1 | 113 | exit 1 |
114 | else | ||
115 | OPENSSL=1 | ||
117 | fi | 116 | fi |
118 | CERTTOOL="openssl" | 117 | CERTTOOL="openssl" |
119 | else | 118 | else |
@@ -124,7 +123,7 @@ generate_cert_key() | |||
124 | if test 1 -eq $OPENSSL | 123 | if test 1 -eq $OPENSSL |
125 | then | 124 | then |
126 | $CERTTOOL genrsa -out $KEYFILE 1024 | 125 | $CERTTOOL genrsa -out $KEYFILE 1024 |
127 | $CERTTOOL req -batch -days 365 -out $CERTFILE, -new -x509 -key $KEYFILE | 126 | $CERTTOOL req -batch -days 365 -out $CERTFILE -new -x509 -key $KEYFILE |
128 | else | 127 | else |
129 | $CERTTOOL --generate-privkey --outfile $KEYFILE 2>/dev/null | 128 | $CERTTOOL --generate-privkey --outfile $KEYFILE 2>/dev/null |
130 | $CERTTOOL --template $GNUTLS_CA_TEMPLATE --generate-self-signed --load-privkey $KEYFILE --outfile $CERTFILE 2>/dev/null | 129 | $CERTTOOL --template $GNUTLS_CA_TEMPLATE --generate-self-signed --load-privkey $KEYFILE --outfile $CERTFILE 2>/dev/null |