Merge pull request usnistgov#45 from vladimirralev/issue44

Fix for usnistgov#44
vladimirralev · Jan 13, 2019 · 13ede11 · 13ede11
2 parents eba9caf + 6e8d425
commit 13ede11
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/gov/nist/core/net/DefaultSecurityManagerProvider.java b/src/gov/nist/core/net/DefaultSecurityManagerProvider.java
@@ -85,8 +85,11 @@ public void init(Properties properties)
         keyManagerFactory = KeyManagerFactory.getInstance(algorithm);
         if(keyStoreFilename != null) {
         	final KeyStore ks = KeyStore.getInstance(keyStoreType);
-        	ks.load(new FileInputStream(new File(keyStoreFilename)), keyStorePassword.toCharArray());
-
+        	if(keyStorePassword != null) {
+        		ks.load(new FileInputStream(new File(keyStoreFilename)), keyStorePassword.toCharArray());
+        	} else {
+        		ks.load(new FileInputStream(new File(keyStoreFilename)), null);
+        	}
         	keyManagerFactory.init(ks, keyStorePassword.toCharArray());
         } else {
         	keyManagerFactory.init(null, null);
@@ -95,7 +98,11 @@ public void init(Properties properties)
         trustManagerFactory = TrustManagerFactory.getInstance(algorithm);
         if(trustStoreFilename != null) {
         	final KeyStore ts = KeyStore.getInstance(trustStoreType);
-        	ts.load(new FileInputStream(new File(trustStoreFilename)), trustStorePassword.toCharArray());
+        	if(trustStorePassword != null) {
+        		ts.load(new FileInputStream(new File(trustStoreFilename)), trustStorePassword.toCharArray());
+        	} else {
+        		ts.load(new FileInputStream(new File(trustStoreFilename)), null);
+        	}
 
         	trustManagerFactory.init((KeyStore) ts);
         } else {