--- a/test/jdk/sun/security/tools/keytool/PKCS12Passwd.java Thu Nov 14 16:34:24 2019 -0800
+++ b/test/jdk/sun/security/tools/keytool/PKCS12Passwd.java Fri Nov 15 09:06:58 2019 +0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,11 +49,11 @@
public static void main(String[] args) throws Exception {
// A PrivateKeyEntry
- kt("-genkeypair -alias a -dname CN=A")
+ kt("-genkeypair -alias a -dname CN=A -keyalg DSA")
.shouldHaveExitValue(0);
// A TrustedCertificateEntry (genkeypair, export, delete, import)
- kt("-genkeypair -alias b -dname CN=B")
+ kt("-genkeypair -alias b -dname CN=B -keyalg DSA")
.shouldHaveExitValue(0);
kt("-exportcert -alias b -file b.cert")
.shouldHaveExitValue(0);
@@ -90,7 +90,7 @@
// A PKCS12 keystore can be loaded as a JKS, and it follows JKS rules
// which means the storepass and keypass can be changed separately!
- ktFull("-genkeypair -alias a -dname CN=A -storetype pkcs12 "
+ ktFull("-genkeypair -alias a -dname CN=A -storetype pkcs12 -keyalg DSA "
+ "-storepass changeit -keypass changeit -keystore p12")
.shouldHaveExitValue(0);
@@ -112,7 +112,7 @@
// PKCS12 rules that both passwords are changed at the same time and
// some commands are rejected.
- ktFull("-genkeypair -alias a -dname CN=A -storetype jks "
+ ktFull("-genkeypair -alias a -dname CN=A -storetype jks -keyalg DSA "
+ "-storepass changeit -keypass changeit -keystore jks")
.shouldHaveExitValue(0);