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

Fixed error ouput when pwgen was not found

Browse source
This commit is contained in:
Li Chen 2013-11-25 21:30:53 +01:00
commit 124a7c2a32
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
misc/CA.sh
View file

@ -25,8 +25,6 @@ usage()
[ $# -lt 1 ] && usage [ $# -lt 1 ] && usage
OUTPUT=`mktemp`
case $1 in case $1 in
"-newca" ) "-newca" )
# echo -e -n "${GREEN}Create the directories, take care this will delete" # echo -e -n "${GREEN}Create the directories, take care this will delete"
@ -47,12 +45,14 @@ case $1 in
sed -i "s/=.*#DIR/= ${ESCAPED} #DIR/" $OPENSSL_CONF sed -i "s/=.*#DIR/= ${ESCAPED} #DIR/" $OPENSSL_CONF
sed -i "s/=.*#CERTTYPE/= server #CERTTYPE/" $OPENSSL_CONF sed -i "s/=.*#CERTTYPE/= server #CERTTYPE/" $OPENSSL_CONF
pass=`pwgen 10 1` 2> $OUTPUT type pwgen > /dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
cat $OUTPUT echo "command not found: pwgen"
exit 5 exit 5
fi fi
pass=`pwgen 10 1`
openssl req -batch -new -keyout ${TOP_DIR}/private/${CAKEY} \ openssl req -batch -new -keyout ${TOP_DIR}/private/${CAKEY} \
-out ${TOP_DIR}/${CAREQ} -passout pass:$pass \ -out ${TOP_DIR}/${CAREQ} -passout pass:$pass \
-config $OPENSSL_CONF -config $OPENSSL_CONF
@ -100,12 +100,14 @@ case $1 in
sed -i "s/=.*#COMMONNAME/= $2#COMMONNAME/" $OPENSSL_CONF sed -i "s/=.*#COMMONNAME/= $2#COMMONNAME/" $OPENSSL_CONF
sed -i "s/=.*#CERTTYPE/= client #CERTTYPE/" $OPENSSL_CONF sed -i "s/=.*#CERTTYPE/= client #CERTTYPE/" $OPENSSL_CONF
pass=`pwgen 10 1` 2> $OUTPUT type pwgen > /dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
cat $OUTPUT echo "command not found: pwgen"
exit 5 exit 5
fi fi
pass=`pwgen 10 1`
openssl req -batch -new -keyout ${2}.key -out ${2}.csr \ openssl req -batch -new -keyout ${2}.key -out ${2}.csr \
-config ${OPENSSL_CONF} -passout pass:$pass -days ${DAYS} -config ${OPENSSL_CONF} -passout pass:$pass -days ${DAYS}