You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/04/30 15:28:55 UTC
svn commit: r1676981 - in /tomcat/trunk:
java/org/apache/coyote/http11/AbstractHttp11Protocol.java
java/org/apache/tomcat/util/net/SSLHostConfig.java
java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
webapps/docs/config/http.xml
Author: markt
Date: Thu Apr 30 13:28:54 2015
New Revision: 1676981
URL: http://svn.apache.org/r1676981
Log:
Rename afer a review
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1676981&r1=1676980&r2=1676981&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu Apr 30 13:28:54 2015
@@ -379,9 +379,9 @@ public abstract class AbstractHttp11Prot
defaultSSLHostConfig.setCertificateKeyFile(certificateKeyFile);
}
- public void setAlgorithm(String certificateAlgorithm) {
+ public void setAlgorithm(String keyManagerAlgorithm) {
registerDefaultSSLHostConfig();
- defaultSSLHostConfig.setCertificateAlgorithm(certificateAlgorithm);
+ defaultSSLHostConfig.setKeyManagerAlgorithm(keyManagerAlgorithm);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1676981&r1=1676980&r2=1676981&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Thu Apr 30 13:28:54 2015
@@ -46,8 +46,8 @@ public class SSLHostConfig {
// Common
private Set<String> protocols = new HashSet<>();
// JSSE
+ private String keyManagerAlgorithm = KeyManagerFactory.getDefaultAlgorithm();
private String keystoreFile = System.getProperty("user.home")+"/.keystore";
- private String certificateAlgorithm = KeyManagerFactory.getDefaultAlgorithm();
// OpenSSL
private String certificateFile;
private String certificateKeyFile;
@@ -137,25 +137,25 @@ public class SSLHostConfig {
// ---------------------------------- JSSE specific configuration properties
- public void setKeystoreFile(String keystoreFile) {
- setProperty("keystoreFile", Type.JSSE);
- this.keystoreFile = keystoreFile;
+ public void setKeyManagerAlgorithm(String keyManagerAlgorithm) {
+ setProperty("keyManagerAlgorithm", Type.JSSE);
+ this.keyManagerAlgorithm = keyManagerAlgorithm;
}
- public String getKeystoreFile() {
- return keystoreFile;
+ public String getKeyManagerAlgorithm() {
+ return keyManagerAlgorithm;
}
- public void setCertificateAlgorithm(String certificateAlgorithm) {
- setProperty("certificateAlgorithm", Type.JSSE);
- this.certificateAlgorithm = certificateAlgorithm;
+ public void setKeystoreFile(String keystoreFile) {
+ setProperty("keystoreFile", Type.JSSE);
+ this.keystoreFile = keystoreFile;
}
- public String getCertificateAlgorithm() {
- return certificateAlgorithm;
+ public String getKeystoreFile() {
+ return keystoreFile;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1676981&r1=1676980&r2=1676981&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java Thu Apr 30 13:28:54 2015
@@ -387,7 +387,7 @@ public class JSSESocketFactory implement
}
return getKeyManagers(keystoreType, endpoint.getKeystoreProvider(),
- sslHostConfig.getCertificateAlgorithm(), endpoint.getKeyAlias());
+ sslHostConfig.getKeyManagerAlgorithm(), endpoint.getKeyAlias());
}
@Override
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1676981&r1=1676980&r2=1676981&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Thu Apr 30 13:28:54 2015
@@ -1051,14 +1051,6 @@
<attributes>
- <attribute name="certificateAlgorithm" required="false">
- <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="certificateFile" required="false">
<p>OpenSSL only (required).</p>
<p>Name of the file that contains the server certificate. The format is
@@ -1080,6 +1072,14 @@
of <code>_default_</code> will be used.</p>
</attribute>
+ <attribute name="keyManagerAlgorithm" required="false">
+ <p>The <code>KeyManager</code> 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="keystoreFile" required="false">
<p>JSSE only.</p>
<p>The pathname of the keystore file where you have stored the server
@@ -1118,20 +1118,11 @@
<attributes>
<attribute name="algorithm" required="false">
- <p>This is an alias for the <code>certificateAlgorithm</code> attribute of the
+ <p>This is an alias for the <code>keyManagerAlgorithm</code> attribute of the
default <a href="#SSL_Support_-_SSLHostConfig">SSLHostConfig</a>
element.</p>
</attribute>
- <attribute name="useServerCipherSuitesOrder" required="false">
- <p>
- Set to <code>true</code> to enforce the server's cipher order
- (from the <code>ciphers</code> setting). Set to <code>false</code>
- to choose the first acceptable cipher suite presented by the client.
- Default is <code>false</code>.
- </p>
- </attribute>
-
<attribute name="ciphers" required="false">
<p>If specified and using ',' as a separator, only the ciphers that are
listed and supported by the SSL implementation will be used.
@@ -1310,6 +1301,15 @@
the default.</p>
</attribute>
+ <attribute name="useServerCipherSuitesOrder" required="false">
+ <p>
+ Set to <code>true</code> to enforce the server's cipher order
+ (from the <code>ciphers</code> setting). Set to <code>false</code>
+ to choose the first acceptable cipher suite presented by the client.
+ Default is <code>false</code>.
+ </p>
+ </attribute>
+
</attributes>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org