svn commit: r1675461 - /tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java

[markt]

Author: markt
Date: Wed Apr 22 19:31:10 2015
New Revision: 1675461

URL: http://svn.apache.org/r1675461
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57833
Need to ensure key aliases are converted to lower case for JKS key stores.
Based on a patch provided by Santosh Giri Govind M.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1675461&r1=1675460&r2=1675461&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Wed 
Apr 22 19:31:10 2015
@@ -17,6 +17,7 @@
 package org.apache.tomcat.util.net;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.net.ssl.KeyManager;
@@ -119,8 +120,13 @@ public abstract class AbstractJsseEndpoi
         if (managers==null) return null;
         KeyManager[] result = new KeyManager[managers.length];
         for (int i=0; i<result.length; i++) {
-            if (managers[i] instanceof X509KeyManager && getKeyAlias()!=null) {
-                result[i] = new 
NioX509KeyManager((X509KeyManager)managers[i],getKeyAlias());
+            if (managers[i] instanceof X509KeyManager && getKeyAlias() != 
null) {
+                String keyAlias = getKeyAlias();
+                // JKS keystores always convert the alias name to lower case
+                if ("jks".equalsIgnoreCase(getKeystoreType())) {
+                    keyAlias = keyAlias.toLowerCase(Locale.ENGLISH);
+                }
+                result[i] = new NioX509KeyManager((X509KeyManager) 
managers[i], keyAlias);
             } else {
                 result[i] = managers[i];
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org