[jboss-cvs] JBossAS SVN: r71586 - branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/net/ssl.

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

Author: jfrederic.clere at jboss.com
Date: 2008-04-02 05:04:45 -0400 (Wed, 02 Apr 2008)
New Revision: 71586

Modified:
   branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/net/ssl/JBossSocketFactory.java
Log:
Fix for JBPAPP-538
--This line, and th se below, will be ignored-- 
M    JBossSocketFactory.java


Modified: branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/net/ssl/JBossSocketFactory.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/net/ssl/JBossSocketFactory.java	2008-04-02 08:48:05 UTC (rev 71585)
+++ branches/JBPAPP_4_2_0_GA_CP/tomcat/src/main/org/jboss/net/ssl/JBossSocketFactory.java	2008-04-02 09:04:45 UTC (rev 71586)
@@ -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,17 @@
       if( kmf != null )
       {
          keyMgrs = kmf.getKeyManagers();
+         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;
    }