Merge "Sonar fixes related to exceptions"

[aaf/authz.git] / cadi / aaf / src / main / java / org / onap / aaf / cadi / configure / PlaceArtifactInKeystore.java

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 cb28260..c541391 100644 (file)
--- 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
@@ -28,7 +28,6 @@ import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -51,7 +50,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==Agent.PKCS12?"p12":kst));
                try {
                        KeyStore jks = KeyStore.getInstance(kst);
                        if(fks.exists()) {
@@ -118,13 +117,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(Agent.JKS);
                        
                        // Set Truststore Password
                        addProperty(Config.CADI_TRUSTSTORE,fks.getAbsolutePath());