Author: rjung
Date: Sun Aug 20 12:26:46 2017
New Revision: 1805550
URL: http://svn.apache.org/viewvc?rev=1805550&view=rev
Log:
Add support for OpenSSLConf to storeconfig.
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java?rev=1805550&r1=1805549&r2=1805550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/SSLHostConfigSF.java Sun
Aug 20 12:26:46 2017
@@ -21,6 +21,7 @@ import java.io.PrintWriter;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SSLHostConfigCertificate;
+import org.apache.tomcat.util.net.openssl.OpenSSLConf;
/**
* Store SSLHostConfig
@@ -39,7 +40,10 @@ public class SSLHostConfigSF extends Sto
// Store nested <SSLHostConfigCertificate> elements
SSLHostConfigCertificate[] hostConfigsCertificates =
sslHostConfig.getCertificates().toArray(new SSLHostConfigCertificate[0]);
storeElementArray(aWriter, indent, hostConfigsCertificates);
+ // Store nested <OpenSSLConf> element
+ OpenSSLConf openSslConf = sslHostConfig.getOpenSslConf();
+ storeElement(aWriter, indent, openSslConf);
}
}
-}
\ No newline at end of file
+}
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml?rev=1805550&r1=1805549&r2=1805550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml Sun
Aug 20 12:26:46 2017
@@ -119,6 +119,7 @@
children="true"
storeFactoryClass="org.apache.catalina.storeconfig.SSLHostConfigSF">
<TransientAttribute>openSslContext</TransientAttribute>
+ <TransientAttribute>openSslConfContext</TransientAttribute>
</Description>
<Description
tag="Certificate"
@@ -128,6 +129,22 @@
children="false"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
+ <Description
+ tag="OpenSSLConf"
+ standard="true"
+ default="true"
+ tagClass="org.apache.tomcat.util.net.openssl.OpenSSLConf"
+ children="true"
+ storeFactoryClass="org.apache.catalina.storeconfig.OpenSSLConfSF">
+ </Description>
+ <Description
+ tag="OpenSSLConfCmd"
+ standard="true"
+ default="true"
+ tagClass="org.apache.tomcat.util.net.openssl.OpenSSLConfCmd"
+ children="false"
+ storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
+ </Description>
<Description
tag="NamingResources"
standard="true"
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java?rev=1805550&r1=1805549&r2=1805550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java Sun
Aug 20 12:26:46 2017
@@ -35,6 +35,10 @@ public class OpenSSLConf {
commands.add(cmd);
}
+ public List<OpenSSLConfCmd> getCommands() {
+ return commands;
+ }
+
public boolean check(long cctx) throws Exception {
boolean result = true;
OpenSSLConfCmd cmd;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
