X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-certman%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fcm%2Fca%2FLocalCA.java;fp=auth%2Fauth-certman%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fcm%2Fca%2FLocalCA.java;h=cd8886dac31ec7b1967a94150531e01acac643bb;hb=54944fe6c6371e73fb01d3a5a0131d5fb5d6ee36;hp=70f67940a1d52bbe8372b3922efb811df7b30693;hpb=1ef69d23678f12c3c78e85c5b4579e305862ed8e;p=aaf%2Fauthz.git

diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/LocalCA.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/LocalCA.java
index 70f67940..cd8886da 100644
--- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/LocalCA.java
+++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/LocalCA.java
@@ -126,19 +126,21 @@ public class LocalCA extends CA {
 				try {
 					Provider p;
 					KeyStore keyStore;
+					FileInputStream fis = null;
 					if(fileName.endsWith(".pkcs11")) {
 						String ksType;
 						p = Factory.getSecurityProvider(ksType="PKCS11",params);
 						keyStore = KeyStore.getInstance(ksType,p);
 					} else if(fileName.endsWith(".jks")) {
 						keyStore = KeyStore.getInstance("JKS");
+					        fis = new FileInputStream(f);
 					} else if(fileName.endsWith(".p12") || fileName.endsWith(".pkcs12")) {
 						keyStore = KeyStore.getInstance("PKCS12");
+					        fis = new FileInputStream(f);
 					} else {
 						throw new CertException("Unknown Keystore type from filename " + fileName);
 					}
 					
-					FileInputStream fis = new FileInputStream(f);
 					KeyStore.ProtectionParameter keyPass;
 
 					try {
@@ -152,9 +154,15 @@ public class LocalCA extends CA {
 
 						keyStore.load(fis,ksPass);
 					} finally {
-						fis.close();
+						if (fis != null)
+							fis.close();
+					}
+					Entry entry;
+					if(fileName.endsWith(".pkcs11")) {
+						entry = keyStore.getEntry(params[0][1]/*alias*/, null);
+					} else {
+						entry = keyStore.getEntry(params[0][1]/*alias*/, keyPass);
 					}
-					Entry entry = keyStore.getEntry(params[0][1]/*alias*/, keyPass);
 					if(entry==null) {
 						throw new CertException("There is no Keystore entry with name '" + params[0][1] +'\'');
 					}