X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fconfigure%2FPlaceArtifactInKeystore.java;h=3123b89eacbe874c46bde115fda3a4e6fd76af0b;hb=refs%2Fchanges%2F51%2F56951%2F1;hp=cb282605ee70fd543871ede5fb47bd01a77cd369;hpb=9c8a8b0926b13b07fb1e5394903401e7a3f1ff79;p=aaf%2Fauthz.git

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactInKeystore.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactInKeystore.java
index cb282605..3123b89e 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactInKeystore.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactInKeystore.java
@@ -51,7 +51,7 @@ public class PlaceArtifactInKeystore extends ArtifactDir {
 
 	@Override
 	public boolean _place(Trans trans, CertInfo certInfo, Artifact arti) throws CadiException {
-		File fks = new File(dir,arti.getNs()+'.'+kst);
+		File fks = new File(dir,arti.getNs()+'.'+(kst=="pkcs12"?"p12":kst));
 		try {
 			KeyStore jks = KeyStore.getInstance(kst);
 			if(fks.exists()) {
@@ -118,13 +118,14 @@ public class PlaceArtifactInKeystore extends ArtifactDir {
 			write(fks,Chmod.to400,jks,keystorePassArray);
 			
 			// Change out to TrustStore
-			fks = new File(dir,arti.getNs()+".trust."+kst);
+			// NOTE: PKCS12 does NOT support Trusted Entries.  Put in JKS Always
+			fks = new File(dir,arti.getNs()+".trust.jks");
 			if(fks.exists()) {
 				File backup = File.createTempFile(fks.getName()+'.', ".backup",dir);
 				fks.renameTo(backup);
 			}	
 
-			jks = KeyStore.getInstance(kst);
+			jks = KeyStore.getInstance("jks");
 			
 			// Set Truststore Password
 			addProperty(Config.CADI_TRUSTSTORE,fks.getAbsolutePath());