CA.sh: disable the timer, fixed some bug

misc/CA.sh

@@ -1,8 +1,12 @@
 # TODO key usage
 
-OPENSSL_CONF=$(pwd)/openssl.cnf
+if [[ -z "${TOP_DIR}" ]]; then
+    TOP_DIR=fic_pki
+fi
 
-TOP_DIR=fic_pki
+if [[ -z "${OPENSSL_CONF}" ]]; then
+    OPENSSL_CONF=openssl.cnf
+fi
 
 CAKEY=./cakey.key
 CAREQ=./careq.csr
@@ -21,13 +25,11 @@ usage()
 
 [ $# -lt 1 ] && usage
 
-export OPENSSL_CONF=${OPENSSL_CONF}
-
 case $1 in
     "-newca" )
-        echo -e -n "${GREEN}Create the directories, take care this will delete"
-        echo -e "the old directories ${COLOR_RST}"
-        sleep 1; echo -n "1 "; sleep 1; echo -n "2 "; sleep 1; echo "3"
+#        echo -e -n "${GREEN}Create the directories, take care this will delete"
+#        echo -e "the old directories ${COLOR_RST}"
+#        sleep 1; echo -n "1 "; sleep 1; echo -n "2 "; sleep 1; echo "3"
 
         rm -rf ${TOP_DIR}
         mkdir -p ${TOP_DIR}/certs
@@ -36,18 +38,27 @@ case $1 in
         mkdir -p ${TOP_DIR}/private
         touch ${TOP_DIR}/index.txt
 
+        ESCAPED=$(echo "${TOP_DIR}" | sed 's/[\/\.]/\\&/g')
+
+        echo $ESCAPED
+
         echo -e "${GREEN}Making CA key and csr${COLOR_RST}"
         sed -i 's/=.*#COMMONNAME/= FIC2014 CA #COMMONNAME/' $OPENSSL_CONF
-        sed -i "s/=.*#DIR/= ${TOP_DIR} #DIR/" $OPENSSL_CONF
+        sed -i "s/=.*#DIR/= ${ESCAPED} #DIR/" $OPENSSL_CONF
         sed -i "s/=.*#CERTTYPE/= server #CERTTYPE/" $OPENSSL_CONF
 
+        pass=`pwgen 10 1`
+
         openssl req -batch -new -keyout ${TOP_DIR}/private/${CAKEY}         \
-                    -out ${TOP_DIR}/${CAREQ}
+                    -out ${TOP_DIR}/${CAREQ} -passout pass:$pass            \
+                    -config $OPENSSL_CONF
 
         echo -e "${GREEN}Self signes the CA certificate${COLOR_RST}"
         openssl ca -batch -create_serial -out ${TOP_DIR}/${CACERT}          \
                 -days ${DAYS} -keyfile ${TOP_DIR}/private/${CAKEY}          \
-                -selfsign -extensions v3_ca -infiles ${TOP_DIR}/${CAREQ}
+                -selfsign -extensions v3_ca -passin pass:$pass              \
+                -infiles ${TOP_DIR}/${CAREQ}
+        echo $pass
         ;;
     "-newserver" )
         echo -e "${GREEN}Making the Server key and cert${COLOR_RST}"
@@ -69,7 +80,10 @@ case $1 in
         fi
         ;;
     "-newclient" )
-        [ $# -ne 2 ] && "Usage: $0 -newclient NAME"
+        if [ $# -ne 2 ]; then
+            echo "Usage: $0 -newclient NAME"
+            exit 1
+        fi
         echo -e "${GREEN}Making the client key and csr${COLOR_RST}"
 
         if ! [ -f ${TOP_DIR}/private/${CAKEY} ]; then
@@ -80,6 +94,7 @@ case $1 in
         sed -i "s/=.*#CERTTYPE/= client #CERTTYPE/" $OPENSSL_CONF
 
         openssl req -batch -new -keyout ${2}.key -out ${2}.csr -days ${DAYS}
+
         echo -e "${GREEN}Signing the Client crt${COLOR_RST}"
         openssl ca -policy policy_match -out ${2}.crt -infiles ${2}.csr
         if [ $? -ne 0 ]; then