stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8207318: KeyStore#getInstance(File, LoadStoreParameter) does not load the keystore

Browse Source 
Reviewed-by: mullan
This commit is contained in:
Weijun Wang 2018-07-17 22:22:00 +08:00
parent 6caaf8e2f2
commit da18d08006
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/java.base/share/classes/java/security/KeyStore.java
View File

@ -1807,6 +1807,7 @@ public class KeyStore {
keystore.load(dataStream, password); keystore.load(dataStream, password);
} else { } else {
keystore.keyStoreSpi.engineLoad(dataStream, param); keystore.keyStoreSpi.engineLoad(dataStream, param);
keystore.initialized = true;
} }
return keystore; return keystore;
} }

8
test/jdk/java/security/KeyStore/ProbeKeystores.java
View File

@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 8044445 8194307 * @bug 8044445 8194307 8207318
* @summary test new methods from JEP-229: Create PKCS12 Keystores by Default * @summary test new methods from JEP-229: Create PKCS12 Keystores by Default
*/ */
@ -180,7 +180,8 @@ public class ProbeKeystores {
throw new Exception("ERROR: expected a " + type + " keystore, " + throw new Exception("ERROR: expected a " + type + " keystore, " +
"got a " + ks.getType() + " keystore instead"); "got a " + ks.getType() + " keystore instead");
} else { } else {
System.out.println("Probed a " + type + " keystore named '" + file + "'"); System.out.println("Probed a " + type + " keystore named '" + file
+ "' with " + ks.size() + " entries");
} }
// Next try with an incorrect password // Next try with an incorrect password
@ -197,7 +198,8 @@ public class ProbeKeystores {
throw new Exception("ERROR: expected a " + type + " keystore, " + throw new Exception("ERROR: expected a " + type + " keystore, " +
"got a " + ks.getType() + " keystore instead"); "got a " + ks.getType() + " keystore instead");
} else { } else {
System.out.println("Probed a " + type + " keystore named '" + file + "'"); System.out.println("Probed a " + type + " keystore named '" + file
+ "' with " + ks.size() + " entries");
} }
// Next try with an incorrect password within a LoadStoreParameter // Next try with an incorrect password within a LoadStoreParameter