--- a/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java +++ b/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java.new @@ -241,13 +241,7 @@ public class JSSEUtil extends SSLUtilBase { Key k = ks.getKey(keyAlias, keyPassArray); if (k != null && "PKCS#8".equalsIgnoreCase(k.getFormat())) { // Switch to in-memory key store - String provider = certificate.getCertificateKeystoreProvider(); - if (provider == null) { - ksUsed = KeyStore.getInstance(certificate.getCertificateKeystoreType()); - } else { - ksUsed = KeyStore.getInstance(certificate.getCertificateKeystoreType(), - provider); - } + ksUsed = KeyStore.getInstance("JKS"); ksUsed.load(null, null); ksUsed.setKeyEntry(keyAlias, k, keyPassArray, ks.getCertificateChain(keyAlias)); }