Author: markt
Date: Thu Feb 21 09:29:29 2019
New Revision: 1854025
URL: http://svn.apache.org/viewvc?rev=1854025&view=rev
Log:
Refactor creation of SSLContext to include configuration
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1854025&r1=1854024&r2=1854025&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Thu
Feb 21 09:29:29 2019
@@ -109,7 +109,6 @@ public abstract class AbstractJsseEndpoi
SSLContext sslContext;
try {
sslContext = sslUtil.createSSLContext(negotiableProtocols);
- sslContext.init(sslUtil.getKeyManagers(),
sslUtil.getTrustManagers(), null);
} catch (Exception e) {
throw new IllegalArgumentException(e.getMessage(), e);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java?rev=1854025&r1=1854024&r2=1854025&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java Thu Feb 21
09:29:29 2019
@@ -203,6 +203,14 @@ public abstract class SSLUtilBase implem
@Override
+ public final SSLContext createSSLContext(List<String> negotiableProtocols)
throws Exception {
+ SSLContext sslContext = createSSLContextInternal(negotiableProtocols);
+ sslContext.init(getKeyManagers(), getTrustManagers(), null);
+ return sslContext;
+ }
+
+
+ @Override
public String[] getEnabledProtocols() {
return enabledProtocols;
}
@@ -217,4 +225,5 @@ public abstract class SSLUtilBase implem
protected abstract Log getLog();
protected abstract boolean isTls13Available();
protected abstract boolean isTls13RenegAuthAvailable();
+ protected abstract SSLContext createSSLContextInternal(List<String>
negotiableProtocols) throws Exception;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java?rev=1854025&r1=1854024&r2=1854025&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java Thu Feb 21
09:29:29 2019
@@ -184,7 +184,8 @@ public class JSSEUtil extends SSLUtilBas
@Override
- public SSLContext createSSLContext(List<String> negotiableProtocols)
throws NoSuchAlgorithmException {
+ public SSLContext createSSLContextInternal(List<String>
negotiableProtocols)
+ throws NoSuchAlgorithmException {
return new JSSESSLContext(sslHostConfig.getSslProtocol());
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java?rev=1854025&r1=1854024&r2=1854025&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java Thu
Feb 21 09:29:29 2019
@@ -84,10 +84,11 @@ public class OpenSSLUtil extends SSLUtil
@Override
- public SSLContext createSSLContext(List<String> negotiableProtocols)
throws Exception {
+ public SSLContext createSSLContextInternal(List<String>
negotiableProtocols) throws Exception {
return new OpenSSLContext(certificate, negotiableProtocols);
}
+
@Override
public KeyManager[] getKeyManagers() throws Exception {
if (jsseUtil != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
