From 0e1c3cea55a1eeece08d4c85be8d295218456b18 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 16 Dec 2009 11:17:30 +0000
Subject: [PATCH] Make SSL config JVM neutral. Based on a suggestion from Ivan.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@891190 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/tomcat/util/net/AbstractEndpoint.java | 4 +++-
 webapps/docs/config/http.xml                          | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 7796e71ee..705c95518 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -23,6 +23,8 @@ import java.util.StringTokenizer;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 
+import javax.net.ssl.KeyManagerFactory;
+
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.IntrospectionUtils;
@@ -453,7 +455,7 @@ public abstract class AbstractEndpoint {
     
     // --------------------  SSL related properties --------------------
 
-    private String algorithm = "SunX509";
+    private String algorithm = KeyManagerFactory.getDefaultAlgorithm();
     public String getAlgorithm() { return algorithm;}
     public void setAlgorithm(String s ) { this.algorithm = s;}
 
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 6466d9342..f9b4323de 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -688,10 +688,11 @@
   <attributes>
 
     <attribute name="algorithm" required="false">
-      <p>The certificate encoding algorithm to be used. This defaults to the Sun
-      implementation (<code>SunX509</code>). For IBM JVMs you should use the
-      value <code>IbmX509</code>. For other vendors, consult the JVM
-      documentation for the correct value.</p>
+      <p>The certificate encoding algorithm to be used. This defaults to
+      <code>KeyManagerFactory.getDefaultAlgorithm()</code> which returns
+      <code>SunX509</code> for Sun JVMs. IBM JVMs return
+      <code>IbmX509</code>. For other vendors, consult the JVM
+      documentation for the default value.</p>
     </attribute>
 
     <attribute name="clientAuth" required="false">
-- 
2.11.0