From dev-return-191913-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org Mon Jul 2 17:47:56 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 15A14180626 for ; Mon, 2 Jul 2018 17:47:55 +0200 (CEST) Received: (qmail 85691 invoked by uid 500); 2 Jul 2018 15:47:54 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 85681 invoked by uid 99); 2 Jul 2018 15:47:54 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Jul 2018 15:47:54 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 646873A006C for ; Mon, 2 Jul 2018 15:47:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1834860 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java Date: Mon, 02 Jul 2018 15:47:54 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180702154754.646873A006C@svn01-us-west.apache.org> Author: markt Date: Mon Jul 2 15:47:54 2018 New Revision: 1834860 URL: http://svn.apache.org/viewvc?rev=1834860&view=rev Log: Don't use in-memory certs with DKS key stores Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java?rev=1834860&r1=1834859&r2=1834860&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java Mon Jul 2 15:47:54 2018 @@ -244,7 +244,8 @@ public class JSSEUtil extends SSLUtilBas } Key k = ks.getKey(keyAlias, keyPassArray); - if (k != null && "PKCS#8".equalsIgnoreCase(k.getFormat())) { + if (k != null && !"DKS".equalsIgnoreCase(certificate.getCertificateKeystoreType()) && + "PKCS#8".equalsIgnoreCase(k.getFormat())) { // Switch to in-memory key store String provider = certificate.getCertificateKeystoreProvider(); if (provider == null) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org