billbarker 2003/06/30 22:27:13 Modified: util/java/org/apache/tomcat/util/net/jsse Tag: coyote_10 JSSE14SocketFactory.java JSSE14Support.java JSSEImplementation.java JSSESocketFactory.java Added: util/java/org/apache/tomcat/util/net/jsse Tag: coyote_10 JSSE13Factory.java JSSE14Factory.java JSSEFactory.java Log: Porting fixes from the HEAD branch. Revision Changes Path No revision No revision 1.2.2.2 +1 -1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java Index: JSSE14SocketFactory.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -r1.2.2.1 -r1.2.2.2 --- JSSE14SocketFactory.java 27 Apr 2003 05:36:50 -0000 1.2.2.1 +++ JSSE14SocketFactory.java 1 Jul 2003 05:27:12 -0000 1.2.2.2 @@ -173,7 +173,7 @@ // create proxy sslProxy = context.getServerSocketFactory(); - logger.debug("Init done"); + return; } catch(Exception e) { if( e instanceof IOException ) 1.4.2.2 +2 -0 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14Support.java Index: JSSE14Support.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14Support.java,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -r1.4.2.1 -r1.4.2.2 --- JSSE14Support.java 27 Apr 2003 05:36:50 -0000 1.4.2.1 +++ JSSE14Support.java 1 Jul 2003 05:27:12 -0000 1.4.2.2 @@ -174,6 +174,8 @@ return null; } } + if(logger.isTraceEnabled()) + logger.trace("Cert #" + i + " = " + x509Certs[i]); } if(x509Certs.length < 1) return null; 1.1.2.2 +24 -45 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java Index: JSSEImplementation.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- JSSEImplementation.java 27 Apr 2003 05:36:50 -0000 1.1.2.1 +++ JSSEImplementation.java 1 Jul 2003 05:27:12 -0000 1.1.2.2 @@ -65,8 +65,6 @@ import org.apache.tomcat.util.net.ServerSocketFactory; import java.io.*; import java.net.*; -import java.lang.reflect.Constructor; -import javax.net.ssl.SSLSocket; /* JSSEImplementation: @@ -77,18 +75,33 @@ public class JSSEImplementation extends SSLImplementation { - static final String JSSE14SocketFactory = - "org.apache.tomcat.util.net.jsse.JSSE14SocketFactory"; - static final String JSSE14Support = - "org.apache.tomcat.util.net.jsse.JSSE14Support"; + static final String JSSE14Factory = + "org.apache.tomcat.util.net.jsse.JSSE14Factory"; + static final String JSSE13Factory = + "org.apache.tomcat.util.net.jsse.JSSE13Support"; static final String SSLSocketClass = "javax.net.ssl.SSLSocket"; static org.apache.commons.logging.Log logger = org.apache.commons.logging.LogFactory.getLog(JSSEImplementation.class); + private JSSEFactory factory; + public JSSEImplementation() throws ClassNotFoundException { // Check to see if JSSE is floating around somewhere - Class.forName("javax.net.ssl.SSLServerSocketFactory"); + Class.forName(SSLSocketClass); + if( JdkCompat.isJava14() ) { + try { + Class factcl = Class.forName(JSSE14Factory); + factory = (JSSEFactory)factcl.newInstance(); + } catch(Exception ex) { + factory = new JSSE13Factory(); + if(logger.isDebugEnabled()) { + logger.debug("Error getting factory: " + JSSE14Factory, ex); + } + } + } else { + factory = new JSSE13Factory(); + } } @@ -96,47 +109,13 @@ return "JSSE"; } - public ServerSocketFactory getServerSocketFactory() - { - ServerSocketFactory ssf = null; - if( JdkCompat.isJava14() ) { - try { - Class ssfCl = Class.forName(JSSE14SocketFactory); - ssf =(ServerSocketFactory)ssfCl.newInstance(); - } catch(Exception ex) { - if(logger.isDebugEnabled()) - logger.debug("Error finding " + JSSE14SocketFactory, ex); - ssf = new JSSESocketFactory(); - } - } else { - ssf = new JSSESocketFactory(); - } + public ServerSocketFactory getServerSocketFactory() { + ServerSocketFactory ssf = factory.getSocketFactory(); return ssf; } - public SSLSupport getSSLSupport(Socket s) - { - SSLSupport ssls = null; - if( JdkCompat.isJava14() ) { - try { - Class sslsCl = Class.forName(JSSE14Support); - Class [] cparams = new Class[1]; - cparams[0] = Class.forName(SSLSocketClass); - Constructor sslc = sslsCl.getConstructor(cparams); - Object [] params = new Object[1]; - params[0] = s; - ssls = (SSLSupport)sslc.newInstance(params); - } catch(Exception ex) { - if(logger.isDebugEnabled()) - logger.debug("Unable to get " + JSSE14Support, ex); - ssls = new JSSESupport((SSLSocket)s); - } - } else { - ssls = new JSSESupport((SSLSocket)s); - } + public SSLSupport getSSLSupport(Socket s) { + SSLSupport ssls = factory.getSSLSupport(s); return ssls; } - - - } 1.1.2.3 +0 -2 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java Index: JSSESocketFactory.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- JSSESocketFactory.java 27 Apr 2003 07:04:08 -0000 1.1.2.2 +++ JSSESocketFactory.java 1 Jul 2003 05:27:12 -0000 1.1.2.3 @@ -94,8 +94,6 @@ { String keystoreType; - static org.apache.commons.logging.Log logger = - org.apache.commons.logging.LogFactory.getLog(JSSESocketFactory.class); static String defaultKeystoreType = "JKS"; static String defaultProtocol = "TLS"; static String defaultAlgorithm = "SunX509"; No revision No revision 1.1.2.1 +0 -0 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13Factory.java Index: JSSE13Factory.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13Factory.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 1.1.2.1 +0 -0 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14Factory.java Index: JSSE14Factory.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14Factory.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 1.1.2.1 +0 -0 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEFactory.java Index: JSSEFactory.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEFactory.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]