fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Fix CA path

Browse source
This commit is contained in:
nemunaire 2014-11-21 23:07:01 +01:00
commit 4538450908
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
misc/CA.sh
View file

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