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=31ca32756d5784d47ba6297a759534701960d797;hb=refs%2Fchanges%2F24%2F97124%2F3;hp=18d74fba6b6c740d2af86b0d39815660feb82a5b;hpb=bdce7667a6e272e2fa32e298d957a0d9090c5bc9;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 18d74fba..31ca3275 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
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -57,12 +57,12 @@ public class PlaceArtifactInKeystore extends ArtifactDir {
             if (fks.exists()) {
                 File backup = File.createTempFile(fks.getName()+'.', ".backup",dir);
                 fks.renameTo(backup);
-            }    
+            }
 
             // Get the Cert(s)... Might include Trust store
             Collection<? extends Certificate> certColl = Factory.toX509Certificate(certInfo.getCerts());
             // find where the trusts end in 1.0 API
-        
+
             X509Certificate x509;
             List<X509Certificate> chainList = new ArrayList<>();
             Set<X509Certificate> caSet = new HashSet<>();
@@ -73,7 +73,7 @@ public class PlaceArtifactInKeystore extends ArtifactDir {
                 if (x509.getSubjectDN().equals(x509.getIssuerDN())) {
                     caSet.add(x509);
                 } else {
-                    // Expect Certs in Trust Chain Order. 
+                    // Expect Certs in Trust Chain Order.
                     if(curr==null) {
                         chainList.add(x509);
                         curr=x509;
@@ -103,12 +103,12 @@ public class PlaceArtifactInKeystore extends ArtifactDir {
             props.add(Config.CADI_KEYSTORE_PASSWORD+'_'+ext,encP);
             char[] keystorePassArray = keystorePass.toCharArray();
             jks.load(null,keystorePassArray); // load in
-            
+
             // Add Private Key/Cert Entry for App
             // Note: Java SSL security classes, while having a separate key from keystore,
-            // is documented to not actually work. 
+            // is documented to not actually work.
             // java.security.UnrecoverableKeyException: Cannot recover key
-            // You can create a custom Key Manager to make it work, but Practicality  
+            // You can create a custom Key Manager to make it work, but Practicality
             // dictates that you live with the default, meaning, they are the same
             String keyPass = keystorePass; //Symm.randomGen(CmAgent.PASS_SIZE);
             PrivateKey pk = Factory.toPrivateKey(trans, certInfo.getPrivatekey());
@@ -118,38 +118,38 @@ public class PlaceArtifactInKeystore extends ArtifactDir {
 //            if (kst.equals("pkcs12")) {
 //                // Friendly Name
 //                attribs.add(new PKCS12Attribute("1.2.840.113549.1.9.20", arti.getNs()));
-//            } 
-//            
-            KeyStore.ProtectionParameter protParam = 
+//            }
+//
+            KeyStore.ProtectionParameter protParam =
                     new KeyStore.PasswordProtection(keyPass.toCharArray());
-            
+
             Certificate[] trustChain = new Certificate[chainList.size()];
             chainList.toArray(trustChain);
-            KeyStore.PrivateKeyEntry pkEntry = 
+            KeyStore.PrivateKeyEntry pkEntry =
                 new KeyStore.PrivateKeyEntry(pk, trustChain);
-            jks.setEntry(arti.getMechid(), 
+            jks.setEntry(arti.getMechid(),
                     pkEntry, protParam);
 
             // Write out
             write(fks,Chmod.to644,jks,keystorePassArray);
-            
+
             // Change out to TrustStore
             // 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(Agent.JKS);
-            
+
             // Set Truststore Password
             props.add(Config.CADI_TRUSTSTORE,fks.getAbsolutePath());
             String trustStorePass = Symm.randomGen(Agent.PASS_SIZE);
             props.addEnc(Config.CADI_TRUSTSTORE_PASSWORD,trustStorePass);
             char[] truststorePassArray = trustStorePass.toCharArray();
             jks.load(null,truststorePassArray); // load in
-            
+
             // Add Trusted Certificates, but PKCS12 doesn't support
             Certificate[] trustCAs = new Certificate[caSet.size()];
             caSet.toArray(trustCAs);