Index: java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
===================================================================
--- java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java	(revision 1080234)
+++ java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java	(working copy)
@@ -474,7 +474,7 @@
         } catch(Exception e) {
             if( e instanceof IOException )
                 throw (IOException)e;
-            throw new IOException(e.getMessage());
+            throw new IOException(e.getMessage(), e);
         }
     }
 
@@ -565,7 +565,11 @@
         }
 
         KeyManagerFactory kmf = KeyManagerFactory.getInstance(algorithm);
-        kmf.init(ks, keystorePass.toCharArray());
+        String keyPass = endpoint.getKeyPass();
+        if (keyPass == null) {
+            keyPass = keystorePass;
+        }
+        kmf.init(ks, keyPass.toCharArray());
 
         kms = kmf.getKeyManagers();
         if (keyAlias != null) {