Improvements of Certs creation scripts

[aaf/authz.git] / conf / CA / p12.sh

diff --git a/conf/CA/p12.sh b/conf/CA/p12.sh
index 53184e2..23e7624 100644 (file)
--- a/conf/CA/p12.sh
+++ b/conf/CA/p12.sh
@@ -1,22 +1,20 @@
 #
 # Create a p12 file from local certs
 #
-echo "FQI (Fully Qualified Identity): "
-read FQI
 
 if [ "$1" = "" ]; then
-  MACH=$FQI  
-else 
+  echo "Enter Keystore Name: "
+  read MACH
+else
   MACH=$1
 fi
 
-# Add Cert AND Intermediate CAs (Clients will have Root CAs (or not))
-  cat $MACH.crt  > $MACH.chain
+  # Add Cert AND Intermediate CAs (Clients will have Root CAs (or not))
+  cat certs/$MACH.crt  > $MACH.chain
   # Add THIS Intermediate CA into chain
-  cat "certs/ca.crt" >> $MACH.chain
+  cat certs/ca.crt >> $MACH.chain
 
   # Make a pkcs12 keystore, a jks keystore and a pem keystore
   rm -f $MACH.p12
   # Note: Openssl will pickup and load all Certs in the Chain file
-  openssl pkcs12 -name $FQI -export -in $MACH.chain -inkey private/$MACH.key -out $MACH.p12 
-
+  openssl pkcs12 -name $MACH -export -in $MACH.chain -inkey private/$MACH.key -out $MACH.p12