X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftlsproxy-add;h=89d64a10ba962c3b8481391921c1913fb4aa1214;hb=0897a092b265edc0cb6496c7f29a6ffabb282f7d;hp=c3acf3e4a19740b632aced94a81b5f5dfaa379cc;hpb=44ab705f30eb1fcb7a86155a6abf01b9394a8db1;p=tlsproxy%2Ftlsproxy.git
diff --git a/src/tlsproxy-add b/src/tlsproxy-add
index c3acf3e..89d64a1 100755
--- a/src/tlsproxy-add
+++ b/src/tlsproxy-add
@@ -4,7 +4,7 @@
#
# Requires certtool (from GnuTLS).
#
-# Copyright (C) 2011-2012 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 "$#" -ne 1 && test "$#" -ne 2; then
echo "Usage: $0 []"
echo
echo "Add the server certificate (as .pem file) for "
@@ -30,7 +32,7 @@ if [ "x$1" = x ]; then
echo "is read from stdin."
echo
echo "The server certificate is NOT validated in any way, you must do "
- echo "that before using this command or you risk using a insecure "
+ echo "that before using this command or you risk using an insecure "
echo "certificate!"
echo
echo "Must be run in the tlsproxy directory where other configuration "
@@ -38,12 +40,8 @@ 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"
@@ -51,16 +49,17 @@ 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
+ --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"