archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8231598: keytool does not export sun.security.mscapi

Browse source 
Reviewed-by: mullan
This commit is contained in:
Weijun Wang 2019-10-24 15:53:20 +08:00
parent 574263a884
commit 72330c70d7
2 changed files with 46 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -304,14 +304,17 @@ public class KeyStoreUtil {
public static void loadProviderByClass( public static void loadProviderByClass(
String provClass, String arg, ClassLoader cl) { String provClass, String arg, ClassLoader cl) {
// For compatibility, SunPKCS11 and OracleUcrypto can still be // For compatibility, SunPKCS11, OracleUcrypto, and SunMSCAPI
// loadable with -providerClass. // can still be loadable with -providerClass.
if (provClass.equals("sun.security.pkcs11.SunPKCS11")) { if (provClass.equals("sun.security.pkcs11.SunPKCS11")) {
loadProviderByName("SunPKCS11", arg); loadProviderByName("SunPKCS11", arg);
return; return;
} else if (provClass.equals("com.oracle.security.crypto.UcryptoProvider")) { } else if (provClass.equals("com.oracle.security.crypto.UcryptoProvider")) {
loadProviderByName("OracleUcrypto", arg); loadProviderByName("OracleUcrypto", arg);
return; return;
} else if (provClass.equals("sun.security.mscapi.SunMSCAPI")) {
loadProviderByName("SunMSCAPI", arg);
return;
} }
Provider prov; Provider prov;

40
test/jdk/sun/security/mscapi/ProviderClassOption.java Normal file
View file

@ -0,0 +1,40 @@
/*
* Copyright (c) 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8231598
* @requires os.family == "windows"
* @library /test/lib
* @summary keytool does not export sun.security.mscapi
*/
import jdk.test.lib.SecurityTools;
public class ProviderClassOption {
public static void main(String[] args) throws Throwable {
SecurityTools.keytool("-v -storetype Windows-ROOT -list"
+ " -providerClass sun.security.mscapi.SunMSCAPI")
.shouldHaveExitValue(0);
}
}