提交 eecab0a5 编写于 作者: W weijun

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

Reviewed-by: mullan
上级 add121df
......@@ -1807,6 +1807,7 @@ public class KeyStore {
keystore.load(dataStream, password);
} else {
keystore.keyStoreSpi.engineLoad(dataStream, param);
keystore.initialized = true;
}
return keystore;
}
......
......@@ -23,7 +23,7 @@
/*
* @test
* @bug 8044445 8194307
* @bug 8044445 8194307 8207318
* @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, " +
"got a " + ks.getType() + " keystore instead");
} 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
......@@ -197,7 +198,8 @@ public class ProbeKeystores {
throw new Exception("ERROR: expected a " + type + " keystore, " +
"got a " + ks.getType() + " keystore instead");
} 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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册