X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Ftlsproxy-add;h=c838a9a35980c5a1ff5d26ab467287d75ac29960;hb=1d65b2374b94b6191d7c3ca53632c9ea416b2b7b;hp=92e20864b68614d7b8ba483095cea314751bf1a8;hpb=c231c86212589d66ec19f359d216ea2b302706c7;p=tlsproxy%2Ftlsproxy.git
diff --git a/src/tlsproxy-add b/src/tlsproxy-add
index 92e2086..c838a9a 100755
--- a/src/tlsproxy-add
+++ b/src/tlsproxy-add
@@ -4,7 +4,7 @@
#
# Requires certtool (from GnuTLS).
#
-# Copyright (C) 2011 Simon Ruderich
+# Copyright (C) 2011-2013 Simon Ruderich
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,7 +20,9 @@
# along with this program. If not, see .
-if [ "x$1" = x ]; then
+set -e
+
+if test "$#" -eq 0; then
echo "Usage: $0 []"
echo
echo "Add the server certificate (as .pem file) for "
@@ -38,29 +40,26 @@ if [ "x$1" = x ]; then
exit 1
fi
-tempfile=`mktemp` || exit 1
-
-die() {
- rm -f $tempfile
- exit 1
-}
+tempfile=`mktemp`
+trap 'rm -f "$tempfile"' EXIT
# Generate server certificate for given host.
-echo 'organization = tlsproxy' > $tempfile
-echo "cn = $1" >> $tempfile
-echo tls_www_server >> $tempfile
-echo encryption_key >> $tempfile
-echo signing_key >> $tempfile
+echo 'organization = tlsproxy' > "$tempfile"
+echo "cn = $1" >> "$tempfile"
+echo tls_www_server >> "$tempfile"
+echo encryption_key >> "$tempfile"
+echo signing_key >> "$tempfile"
+echo 'expiration_days = 3650' >> "$tempfile"
certtool --generate-certificate \
--load-privkey proxy-key.pem \
--load-ca-certificate proxy-ca.pem \
--load-ca-privkey proxy-ca-key.pem \
- --template $tempfile \
- --outfile "certificate-$1-proxy.pem" || die
-rm $tempfile
+ --template "$tempfile" \
+ --outfile "certificate-$1-proxy.pem"
+rm "$tempfile"
-if [ "x$2" = x ]; then
- echo please enter server certificate
+if test "x$2" = x; then
+ echo 'Please enter server certificate (Ctrl-D to terminate input).'
cat > "certificate-$1-server.pem"
else
cp "$2" "certificate-$1-server.pem"