Author: markt Date: Wed Dec 16 11:17:30 2009 New Revision: 891190 URL: http://svn.apache.org/viewvc?rev=891190&view=rev Log: Make SSL config JVM neutral. Based on a suggestion from Ivan.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java tomcat/trunk/webapps/docs/config/http.xml Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=891190&r1=891189&r2=891190&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Wed Dec 16 11:17:30 2009 @@ -23,6 +23,8 @@ 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 @@ // -------------------- 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;} Modified: tomcat/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=891190&r1=891189&r2=891190&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/config/http.xml (original) +++ tomcat/trunk/webapps/docs/config/http.xml Wed Dec 16 11:17:30 2009 @@ -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"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org