archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +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.
*
* This code is free software; you can redistribute it and/or modify it
@ -304,14 +304,17 @@ public class KeyStoreUtil {
public static void loadProviderByClass(
String provClass, String arg, ClassLoader cl) {
// For compatibility, SunPKCS11 and OracleUcrypto can still be
// loadable with -providerClass.
// For compatibility, SunPKCS11, OracleUcrypto, and SunMSCAPI
// can still be loadable with -providerClass.
if (provClass.equals("sun.security.pkcs11.SunPKCS11")) {
loadProviderByName("SunPKCS11", arg);
return;
} else if (provClass.equals("com.oracle.security.crypto.UcryptoProvider")) {
loadProviderByName("OracleUcrypto", arg);
return;
} else if (provClass.equals("sun.security.mscapi.SunMSCAPI")) {
loadProviderByName("SunMSCAPI", arg);
return;
}
Provider prov;