From f23e4e0d0cf48153dbc5134cf1bf1bb7189c3005 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Tue, 8 Dec 2015 19:50:09 +0100
Subject: Various fixes.

---
 letsencrypt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'letsencrypt')

diff --git a/letsencrypt b/letsencrypt
index 50406f7..5c10ea1 100755
--- a/letsencrypt
+++ b/letsencrypt
@@ -16,7 +16,7 @@ declare COMMAND ACCOUNTKEY
 declare -l GENKEY
 declare RUNAS QUIET= DEBUG=
 
-declare SRVCERT= CHAIN= CSR SRVKEY
+declare SRVCRT= CHAIN= CSR SRVKEY
 declare -l HASH=
 declare SUBJECT=/
 declare SAN=
@@ -96,7 +96,7 @@ while [ $# -gt 0 ]; do
         --quiet|-q) QUIET=1;;
         --debug) DEBUG=1;;
 
-        --output=*) SRVCERT="${1#*=}";;
+        --output=*) SRVCRT="${1#*=}";;
         --chain) CHAIN=1;;
         --csr=*) CSR="${1#*=}";;
         --key=*) SRVKEY="${1#*=}";;
@@ -160,7 +160,7 @@ if [ "$COMMAND" = 'revoke-cert' ]; then
         exit 1
     fi
 elif [ "$COMMAND" = 'new-cert' ]; then
-    if [ ! "${SRVCERT:-}" ]; then
+    if [ ! "${SRVCRT:-}" ]; then
         echo "Error: Missing --output" >&2
         exit 1
     fi
@@ -270,10 +270,12 @@ if [ "$COMMAND" = 'new-cert' ]; then
     # TODO
     # Verify: dump and compare public keys
     # Valid cert, signed by the right CA
-
-    # Copy "$x509" to "$SRVCERT", possibly chained
     # https://crt.sh/?q=cse-fresti.cse.chalmers.se&iCAID=7395
-    cp "$x509" "$SRVCERT"
+
+    # if it doesn't exist, create the file with mode 0644 minus the process's umask(2)
+    [ -e "$SRVCRT" ] || touch "$SRVCRT"
+    cat "$x509" >"$SRVCRT"
+    [ ! "$DEBUG" ] || openssl x509 -noout -text <"$SRVCRT"
 
     for (( i=0; i<${#NOTIFY[@]}; i++ )); do
         ${NOTIFY[$i]}
-- 
cgit v1.2.3