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

8213010: Supporting keys created with certmgr.exe

Browse source 
Reviewed-by: valeriep
This commit is contained in:
Weijun Wang 2018-12-13 17:28:30 +08:00
parent dcb88767a7
commit a438a0766c
8 changed files with 720 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/CKeyStore.java
View file

@ -759,12 +759,12 @@ abstract class CKeyStore extends KeyStoreSpi {
}
/**
* Generates RSA key and certificate chain from the private key handle,
* Generates key and certificate chain from the private key handle,
* collection of certificates and stores the result into key entries.
* <p>
* This method is called by native codes in security.cpp.
*/
private void generateRSAKeyAndCertificateChain(String alias,
private void generateKeyAndCertificateChain(boolean isRSA, String alias,
long hCryptProv, long hCryptKey, int keyLength,
Collection<? extends Certificate> certCollection) {
try {
@ -777,7 +777,7 @@ abstract class CKeyStore extends KeyStoreSpi {
certChain[i] = (X509Certificate) iter.next();
}
storeWithUniqueAlias(alias, new KeyEntry(alias,
CPrivateKey.of("RSA", hCryptProv, hCryptKey, keyLength),
CPrivateKey.of(isRSA ? "RSA" : "EC", hCryptProv, hCryptKey, keyLength),
certChain));
} catch (Throwable e) {
// Ignore the exception and skip this entry