--- a/jdk/test/sun/security/tools/keytool/KeyToolTest.java Mon Jul 11 17:18:59 2016 -0700
+++ b/jdk/test/sun/security/tools/keytool/KeyToolTest.java Tue Jul 12 09:41:49 2016 +0800
@@ -82,8 +82,9 @@
static final String NSS_P11_ARG =
"-keystore NONE -storetype PKCS11 -providerName SunPKCS11-nss " +
- "-providerClass sun.security.pkcs11.SunPKCS11 " +
+ "-addprovider SunPKCS11 " +
"-providerArg p11-nss.txt ";
+ // Use -providerClass here, to confirm it still works for SunPKCS11.
static final String NSS_SRC_P11_ARG =
"-srckeystore NONE -srcstoretype PKCS11 " +
"-srcproviderName SunPKCS11-nss " +
@@ -91,12 +92,12 @@
"-providerArg p11-nss.txt ";
static final String NZZ_P11_ARG =
"-keystore NONE -storetype PKCS11 -providerName SunPKCS11-nzz " +
- "-providerClass sun.security.pkcs11.SunPKCS11 " +
+ "-addprovider SunPKCS11 " +
"-providerArg p11-nzz.txt ";
static final String NZZ_SRC_P11_ARG =
"-srckeystore NONE -srcstoretype PKCS11 " +
"-srcproviderName SunPKCS11-nzz " +
- "-providerClass sun.security.pkcs11.SunPKCS11 " +
+ "-addprovider SunPKCS11 " +
"-providerArg p11-nzz.txt ";
static final String SUN_P11_ARG = "-keystore NONE -storetype PKCS11 ";
static final String SUN_SRC_P11_ARG =
@@ -1715,9 +1716,9 @@
// 14. keytool -printcert -file cert
testOK("", "-printcert -file cert -keystore x.jks -storetype JKS");
remove("cert");
- // 15. keytool -list -storepass password -provider sun.security.provider.Sun
+ // 15. keytool -list -storepass password -addprovider SUN
testOK("", "-list -storepass password" +
- " -provider sun.security.provider.Sun" +
+ " -addprovider SUN" +
" -keystore x.jks -storetype JKS");
//Error tests