--- a/test/jdk/sun/security/tools/keytool/KeyToolTest.java Fri Nov 16 19:27:21 2018 -0800
+++ b/test/jdk/sun/security/tools/keytool/KeyToolTest.java Sat Nov 17 18:11:23 2018 +0800
@@ -638,12 +638,12 @@
"-genkeypair -alias p1 -dname CN=olala");
// when specify keypass, make sure keypass==storepass...
testOK("changeit\n", "-keystore x.p12 -keypass changeit " +
- "-storetype PKCS12 -genkeypair -alias p3 -dname CN=olala");
+ "-storetype PKCS12 -genkeypair -keyalg DSA -alias p3 -dname CN=olala");
assertTrue(err.indexOf("Warning") == -1,
"PKCS12 silent when keypass == storepass");
// otherwise, print a warning
testOK("changeit\n", "-keystore x.p12 -keypass another" +
- " -storetype PKCS12 -genkeypair -alias p2 -dname CN=olala");
+ " -storetype PKCS12 -genkeypair -keyalg DSA -alias p2 -dname CN=olala");
assertTrue(err.indexOf("Warning") != -1,
"PKCS12 warning when keypass != storepass");
// no -keypasswd for PKCS12
@@ -663,12 +663,12 @@
"-genkeypair -alias p1 -dname CN=olala");
// when specify keypass, make sure keypass==storepass...
testOK("", "-storepass changeit -keystore x.p12 -keypass changeit " +
- "-storetype PKCS12 -genkeypair -alias p3 -dname CN=olala");
+ "-storetype PKCS12 -genkeypair -keyalg DSA -alias p3 -dname CN=olala");
assertTrue(err.indexOf("Warning") == -1,
"PKCS12 silent when keypass == storepass");
// otherwise, print a warning
testOK("", "-storepass changeit -keystore x.p12 -keypass another " +
- "-storetype PKCS12 -genkeypair -alias p2 -dname CN=olala");
+ "-storetype PKCS12 -genkeypair -keyalg DSA -alias p2 -dname CN=olala");
assertTrue(err.indexOf("Warning") != -1,
"PKCS12 warning when keypass != storepass");