diff options
author | Julius Bünger <buenger@mytum.de> | 2022-06-10 15:08:20 +0200 |
---|---|---|
committer | Julius Bünger <buenger@mytum.de> | 2022-06-10 15:08:20 +0200 |
commit | e12f2fba71c116b754c19c2593a9c9bc0615f598 (patch) | |
tree | 054c25a5c2fbfb9ec1ab9e45b9208a463b6a06bd /src | |
parent | ff7753975e287cb60df51b6ce6a51241c8f4ed59 (diff) | |
download | gnunet-e12f2fba71c116b754c19c2593a9c9bc0615f598.tar.gz gnunet-e12f2fba71c116b754c19c2593a9c9bc0615f598.zip |
-TRANSPORT(fix): consider certtooldev/ch3/fix-certtool
Previously this script only checked for `gnutls-certtool` and `openssl`.
Now it checks for `certtool` as well.
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/gnunet-transport-certificate-creation.in | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/transport/gnunet-transport-certificate-creation.in b/src/transport/gnunet-transport-certificate-creation.in index 8348dd1b7..454f05a5d 100644 --- a/src/transport/gnunet-transport-certificate-creation.in +++ b/src/transport/gnunet-transport-certificate-creation.in | |||
@@ -107,14 +107,19 @@ 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 | if test -z "`openssl version`" > /dev/null | 110 | if test -z "`certtool --version`" > /dev/null |
111 | then | 111 | then |
112 | warningmsg "Install either gnutls certtool or openssl for certificate generation!" | 112 | if test -z "`openssl version`" > /dev/null |
113 | exit 1 | 113 | then |
114 | warningmsg "Install either gnutls certtool or openssl for certificate generation!" | ||
115 | exit 1 | ||
116 | else | ||
117 | OPENSSL=1 | ||
118 | fi | ||
119 | CERTTOOL="openssl" | ||
114 | else | 120 | else |
115 | OPENSSL=1 | 121 | CERTTOOL="certtool" |
116 | fi | 122 | fi |
117 | CERTTOOL="openssl" | ||
118 | else | 123 | else |
119 | CERTTOOL="gnutls-certtool" | 124 | CERTTOOL="gnutls-certtool" |
120 | fi | 125 | fi |