Author: markt
Date: Mon Jan 11 14:41:07 2016
New Revision: 1724042
URL: http://svn.apache.org/viewvc?rev=1724042&view=rev
Log:
JSSESocketFactory is not a socket factory. Time for a rename.
Added:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
- copied, changed from r1724040,
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Removed:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java?rev=1724042&r1=1724041&r2=1724042&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
Mon Jan 11 14:41:07 2016
@@ -47,6 +47,6 @@ public class JSSEImplementation extends
@Override
public SSLUtil getSSLUtil(SSLHostConfig sslHostConfig,
SSLHostConfigCertificate certificate) {
- return new JSSESocketFactory(sslHostConfig, certificate);
+ return new JSSEUtil(sslHostConfig, certificate);
}
}
Copied: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java (from
r1724040,
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/JSSEUtil.java?p2=tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java&p1=tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java&r1=1724040&r2=1724042&rev=1724042&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java Mon Jan 11
14:41:07 2016
@@ -61,21 +61,18 @@ import org.apache.tomcat.util.net.SSLUti
import org.apache.tomcat.util.res.StringManager;
/**
- * SSL server socket factory. It <b>requires</b> a valid RSA key and
- * JSSE.<br>
- * keytool -genkey -alias tomcat -keyalg RSA<br>
- * Use "changeit" as password (this is the default we use).
+ * SSLUtil implementation for JSSE.
*
* @author Harish Prabandham
* @author Costin Manolache
* @author Stefan Freyr Stefansson
- * @author EKR -- renamed to JSSESocketFactory
+ * @author EKR
* @author Jan Luehe
*/
-public class JSSESocketFactory implements SSLUtil {
+public class JSSEUtil implements SSLUtil {
- private static final Log log = LogFactory.getLog(JSSESocketFactory.class);
- private static final StringManager sm =
StringManager.getManager(JSSESocketFactory.class);
+ private static final Log log = LogFactory.getLog(JSSEUtil.class);
+ private static final StringManager sm =
StringManager.getManager(JSSEUtil.class);
private final SSLHostConfig sslHostConfig;
private final SSLHostConfigCertificate certificate;
@@ -83,7 +80,7 @@ public class JSSESocketFactory implement
private final String[] defaultServerProtocols;
- public JSSESocketFactory (SSLHostConfig sslHostConfig,
SSLHostConfigCertificate certificate) {
+ public JSSEUtil (SSLHostConfig sslHostConfig, SSLHostConfigCertificate
certificate) {
this.sslHostConfig = sslHostConfig;
this.certificate = certificate;
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=1724042&r1=1724041&r2=1724042&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 Mon
Jan 11 14:41:07 2016
@@ -26,13 +26,13 @@ import org.apache.tomcat.util.net.SSLCon
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SSLHostConfigCertificate;
import org.apache.tomcat.util.net.SSLUtil;
-import org.apache.tomcat.util.net.jsse.JSSESocketFactory;
+import org.apache.tomcat.util.net.jsse.JSSEUtil;
public class OpenSSLUtil implements SSLUtil {
private final SSLHostConfig sslHostConfig;
private final SSLHostConfigCertificate certificate;
- private final JSSESocketFactory jsseUtil;
+ private final JSSEUtil jsseUtil;
private String[] enabledProtocols = null;
private String[] enabledCiphers = null;
@@ -42,7 +42,7 @@ public class OpenSSLUtil implements SSLU
this.certificate = certificate;
if (certificate.getCertificateFile() == null) {
// Using JSSE configuration for keystore and truststore
- jsseUtil = new JSSESocketFactory(sslHostConfig, certificate);
+ jsseUtil = new JSSEUtil(sslHostConfig, certificate);
} else {
// Use OpenSSL configuration for certificates
jsseUtil = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
