tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse JSSE13SocketFactory.java JSSE14SocketFactory.java JSSESocketFactory.java
Date Fri, 02 Jul 2004 03:27:39 GMT
billbarker    2004/07/01 20:27:39

  Modified:    util/java/org/apache/tomcat/util/net/jsse
                        JSSE13SocketFactory.java JSSE14SocketFactory.java
                        JSSESocketFactory.java
  Log:
  Revert back to where not configuring Ciphers means that you get all available ciphers.
  
  Fix for Bug #29695
  
  Revision  Changes    Path
  1.9       +1 -4      jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java
  
  Index: JSSE13SocketFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JSSE13SocketFactory.java	24 Feb 2004 08:50:05 -0000	1.8
  +++ JSSE13SocketFactory.java	2 Jul 2004 03:27:39 -0000	1.9
  @@ -119,11 +119,8 @@
   
               // Determine which cipher suites to enable
               String requestedCiphers = (String)attributes.get("ciphers");
  -            if (requestedCiphers != null) {
  -                enabledCiphers = getEnabledCiphers
  -                    (requestedCiphers,
  +            enabledCiphers = getEnabledCiphers(requestedCiphers,
                        sslProxy.getSupportedCipherSuites());
  -            }
   
           } catch(Exception e) {
               if( e instanceof IOException )
  
  
  
  1.23      +2 -4      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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- JSSE14SocketFactory.java	24 Feb 2004 08:50:05 -0000	1.22
  +++ JSSE14SocketFactory.java	2 Jul 2004 03:27:39 -0000	1.23
  @@ -116,10 +116,8 @@
   
               // Determine which cipher suites to enable
               String requestedCiphers = (String)attributes.get("ciphers");
  -            if (requestedCiphers != null) {
  -                enabledCiphers = getEnabledCiphers(requestedCiphers,
  -                                                   sslProxy.getSupportedCipherSuites());
  -            }
  +            enabledCiphers = getEnabledCiphers(requestedCiphers,
  +                                               sslProxy.getSupportedCipherSuites());
   
           } catch(Exception e) {
               if( e instanceof IOException )
  
  
  
  1.16      +3 -1      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- JSSESocketFactory.java	24 Feb 2004 08:50:05 -0000	1.15
  +++ JSSESocketFactory.java	2 Jul 2004 03:27:39 -0000	1.16
  @@ -187,6 +187,8 @@
                   enabledCiphers = new String[vec.size()];
                   vec.copyInto(enabledCiphers);
               }
  +        } else {
  +            enabledCiphers = supportedCiphers;
           }
   
           return enabledCiphers;
  @@ -351,7 +353,7 @@
   
           SSLServerSocket socket = (SSLServerSocket) ssocket;
   
  -        if (attributes.get("ciphers") != null) {
  +        if (enabledCiphers != null) {
               socket.setEnabledCipherSuites(enabledCiphers);
           }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message