[jboss-cvs] JBossAS SVN: r71584 - trunk/tomcat/src/main/org/jboss/net/ssl.

[jboss-cvs-commits at lists.jboss.org]

Author: jfrederic.clere at jboss.com
Date: 2008-04-02 04:43:53 -0400 (Wed, 02 Apr 2008)
New Revision: 71584

Modified:
   trunk/tomcat/src/main/org/jboss/net/ssl/JBossSocketFactory.java
Log:
Fix for JBPAPP-538


Modified: trunk/tomcat/src/main/org/jboss/net/ssl/JBossSocketFactory.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/net/ssl/JBossSocketFactory.java	2008-04-02 08:11:11 UTC (rev 71583)
+++ trunk/tomcat/src/main/org/jboss/net/ssl/JBossSocketFactory.java	2008-04-02 08:43:53 UTC (rev 71584)
@@ -33,6 +33,8 @@
 
 import org.jboss.security.SecurityDomain;
 import org.apache.tomcat.util.net.jsse.JSSESocketFactory;
+import org.apache.tomcat.util.net.jsse.JSSEKeyManager;
+import javax.net.ssl.X509KeyManager;
 
 /**
  * Extends the tomcat JSSE14SocketFactory to obtain the server key and trust
@@ -150,6 +152,18 @@
       if( kmf != null )
       {
          keyMgrs = kmf.getKeyManagers();
+         /* from tomcat JSSESocketFactory.java */
+         if (keyAlias != null)
+         {
+            if ("JKS".equals(keystoreType))
+            {
+               keyAlias = keyAlias.toLowerCase();
+            }
+            for(int i=0; i<keyMgrs.length; i++)
+            {
+               keyMgrs[i] = new JSSEKeyManager((X509KeyManager)keyMgrs[i], keyAlias);
+            }
+         }      
       }
       return keyMgrs;
    }