From 453845090841e8cecb019141bc88cdf2a3f4f909 Mon Sep 17 00:00:00 2001
From: nemunaire <nemunaire@nemunai.re>
Date: Fri, 21 Nov 2014 23:07:01 +0100
Subject: [PATCH] Fix CA path

---
 misc/CA.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/misc/CA.sh b/misc/CA.sh
index d5248ce7..362984c9 100755
--- a/misc/CA.sh
+++ b/misc/CA.sh
@@ -179,7 +179,7 @@ case $1 in
 
 	CLTNAM=$2
 	CLTREQ=${TOP_DIR}/${CLTNAM}.csr
-	CLTCRT=${TOP_DIR}/${CLTNAM}.crt
+	CLTCRT=${TOP_DIR}/certs/${CLTNAM}.crt
 	CLTKEY=${TOP_DIR}/${CLTNAM}.key
 	CLTP12=${TOP_DIR}/pkcs/${CLTNAM}.p12
 
@@ -232,7 +232,6 @@ case $1 in
         else
             echo $ECHO_OPTS "Exported pkcs12 file is ${CLTP12}"
         fi
-        mv ${CLTCRT} ${TOP_DIR}/certs
         echo "$CLTNAM:$pass" >> ${TOP_DIR}/../teams.pass
 	echo "$CLTNAM:$pass"
         clean "client" ${CLTNAM}
@@ -245,12 +244,12 @@ case $1 in
         fi
 
 	CLTNAM=$2
-	CLTCRT=${TOP_DIR}/${CLTNAM}.crt
+	CLTCRT=${TOP_DIR}/certs/${CLTNAM}.crt
 	CLTP12=${TOP_DIR}/pkcs/${CLTNAM}.p12
 
         echo $ECHO_OPTS "${GREEN}Revocate ${BOLD}${CLTNAM}${END_BOLD}${COLOR_RST}"
-        if ! openssl ca -revoke ${CLTCRT} -config ${OPENSSL_CONF}\
-                     -keyfile ${CAKEY} -cert ${CACRT} > $OUTPUT 2>&1
+        if ! openssl ca -revoke "${CLTCRT}" -config "${OPENSSL_CONF}" \
+                     -keyfile "${CAKEY}" -cert "${CACRT}" > $OUTPUT 2>&1
 	then
             echo $ECHO_OPTS "${RED}Revocation failed for ${BOLD}${CLTNAM}${END_BOLD}${COLOR_RST}"
             cat $OUTPUT