X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=conf%2FCA%2Fp12.sh;h=23e762472494ea2253801f345a6e2d3cf49b6dba;hb=54883b4545dc32a5e4c7fbe0a49ef5b89a615435;hp=f490b187b4a8deec20749a542433c206b3555f35;hpb=31d847ed8562bc6169fd8c33af93302d67ab074e;p=aaf%2Fauthz.git

diff --git a/conf/CA/p12.sh b/conf/CA/p12.sh
index f490b187..23e76247 100644
--- a/conf/CA/p12.sh
+++ b/conf/CA/p12.sh
@@ -1,23 +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
-  for CA in `ls intermediateCAs`; do
-        cat "intermediateCAs/$CA" >> $MACH.chain
-  done
+  # 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
 
   # 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