Attachment 35359 Details for Bug 61557 – Proposed patch for 9.0.x

[patch] Proposed patch for 9.0.x

bug-61557-tc9-v1.patch (text/plain), 1.05 KB, created by Mark Thomas on 2017-09-21 22:35:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Thomas

Created: 2017-09-21 22:35:38 UTC

Size: 1.05 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 61557: 35359