diff options
Diffstat (limited to 'src/transport/gnunet-transport-certificate-creation.in')
-rw-r--r-- | src/transport/gnunet-transport-certificate-creation.in | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/transport/gnunet-transport-certificate-creation.in b/src/transport/gnunet-transport-certificate-creation.in index 454f05a5d..dfcb4e8e9 100644 --- a/src/transport/gnunet-transport-certificate-creation.in +++ b/src/transport/gnunet-transport-certificate-creation.in | |||
@@ -42,6 +42,10 @@ | |||
42 | 42 | ||
43 | progname=${0##*/} | 43 | progname=${0##*/} |
44 | 44 | ||
45 | existence() { | ||
46 | command -v "$1" >/dev/null 2>&1 | ||
47 | } | ||
48 | |||
45 | setdefaults() | 49 | setdefaults() |
46 | { | 50 | { |
47 | verbosity=0 | 51 | verbosity=0 |
@@ -105,21 +109,23 @@ generate_cert_key() | |||
105 | CERTTOOL="" | 109 | CERTTOOL="" |
106 | GNUTLS_CA_TEMPLATE=@PKGDATADIRECTORY@/gnunet-gns-proxy-ca.template | 110 | GNUTLS_CA_TEMPLATE=@PKGDATADIRECTORY@/gnunet-gns-proxy-ca.template |
107 | OPENSSL=0 | 111 | OPENSSL=0 |
108 | if test -z "`gnutls-certtool --version`" > /dev/null | 112 | if test -x $(existence gnunet-certtool) |
113 | #if test -z "`gnutls-certtool --version`" > /dev/null | ||
109 | then | 114 | then |
110 | if test -z "`certtool --version`" > /dev/null | 115 | if test -z "`certtool --version | grep gnutls`" > /dev/null |
111 | then | 116 | then |
112 | if test -z "`openssl version`" > /dev/null | 117 | warningmsg "'gnutls-certtool' or 'certtool' command not found. Trying openssl." |
118 | # if test -z "`openssl version`" > /dev/null | ||
119 | if test -x $(existence openssl) | ||
113 | then | 120 | then |
121 | OPENSSL=1 | ||
122 | else | ||
114 | warningmsg "Install either gnutls certtool or openssl for certificate generation!" | 123 | warningmsg "Install either gnutls certtool or openssl for certificate generation!" |
124 | statusmsg "Cleaning up." | ||
115 | exit 1 | 125 | exit 1 |
116 | else | ||
117 | OPENSSL=1 | ||
118 | fi | 126 | fi |
119 | CERTTOOL="openssl" | ||
120 | else | ||
121 | CERTTOOL="certtool" | ||
122 | fi | 127 | fi |
128 | CERTTOOL="certtool" | ||
123 | else | 129 | else |
124 | CERTTOOL="gnutls-certtool" | 130 | CERTTOOL="gnutls-certtool" |
125 | fi | 131 | fi |
@@ -127,8 +133,8 @@ generate_cert_key() | |||
127 | 133 | ||
128 | if test 1 -eq $OPENSSL | 134 | if test 1 -eq $OPENSSL |
129 | then | 135 | then |
130 | $CERTTOOL genrsa -out $KEYFILE 1024 | 136 | openssl genrsa -out $KEYFILE 1024 |
131 | $CERTTOOL req -batch -days 365 -out $CERTFILE -new -x509 -key $KEYFILE | 137 | openssl req -batch -days 365 -out $CERTFILE -new -x509 -key $KEYFILE |
132 | else | 138 | else |
133 | $CERTTOOL --generate-privkey --outfile $KEYFILE 2>/dev/null | 139 | $CERTTOOL --generate-privkey --outfile $KEYFILE 2>/dev/null |
134 | $CERTTOOL --template $GNUTLS_CA_TEMPLATE --generate-self-signed --load-privkey $KEYFILE --outfile $CERTFILE 2>/dev/null | 140 | $CERTTOOL --template $GNUTLS_CA_TEMPLATE --generate-self-signed --load-privkey $KEYFILE --outfile $CERTFILE 2>/dev/null |