Attachment 635773 Details for Bug 871171 – tomcatjss support for TLS v. 1.1

[patch] tomcatjss support for TLS v. 1.1

tomcatjss-TLSv1.1support.patch4 (text/plain), 3.42 KB, created by Christina Fu on 2012-10-30 20:11:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christina Fu

Created: 2012-10-30 20:11:00 UTC

Size: 3.42 KB

patch

obsolete

>diff -up tomcatjss-2.1.0/src/org/apache/tomcat/util/net/jss/JSSSocketFactory.java.cfusaved tomcatjss-2.1.0/src/org/apache/tomcat/util/net/jss/JSSSocketFactory.java
>--- tomcatjss-2.1.0/src/org/apache/tomcat/util/net/jss/JSSSocketFactory.java.cfusaved	2012-10-29 21:01:13.105868000 -0700
>+++ tomcatjss-2.1.0/src/org/apache/tomcat/util/net/jss/JSSSocketFactory.java	2012-10-29 21:05:14.886146000 -0700
>@@ -276,6 +276,53 @@ public class JSSSocketFactory
>       }
>     }
> 
>+ 
>+    /*
>+     * sslVersionRange_s takes on the form of "min:max" where
>+     * min/max values can be "ssl3 tls1.0 or tls1.1"
>+     * ssl2 is not supported for tomcatjss via this interface
>+     * The format is "sslVersionRange=min:max"
>+     */
>+    public void setSSLVersionRangeDefault(String sslVersionRange_s) throws SocketException, IllegalArgumentException {
>+        String[] sslVersionRange = sslVersionRange_s.split(":"); 
>+        if (sslVersionRange.length != 2) {
>+          try {
>+            debugWrite("JSSSocketFactory setSSLversionRangeDefault- SSL Version Range format error: " + sslVersionRange_s);
>+          } catch (IOException e) {
>+          }
>+            throw new SocketException("tomcatjss: setSSLversionRangeDefault format error");
>+        }
>+        String min_s = sslVersionRange[0];
>+        String max_s = sslVersionRange[1];
>+        int min = getSSLVersionRangeEnum(min_s);
>+        int max = getSSLVersionRangeEnum(max_s);
>+        if ((min == -1) || (max== -1)) {
>+          try {
>+            debugWrite("JSSSocketFactory setSSLversionRangeDefault- SSL Version Range format error: " + sslVersionRange_s);
>+          } catch (IOException e) {
>+          }
>+            throw new SocketException("tomcatjss: setSSLversionRangeDefault format error");
>+        }
>+
>+        org.mozilla.jss.ssl.SSLSocket.SSLVersionRange range = new org.mozilla.jss.ssl.SSLSocket.SSLVersionRange(min, max);
>+
>+        SSLSocket.setSSLVersionRangeDefault(org.mozilla.jss.ssl.SSLSocket.SSLProtocolVariant.STREAM, range);
>+        SSLSocket.setSSLVersionRangeDefault(org.mozilla.jss.ssl.SSLSocket.SSLProtocolVariant.DATA_GRAM, range);
>+    }
>+
>+    int getSSLVersionRangeEnum (String rangeString) {
>+        if (rangeString.equals("ssl3"))
>+            return org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.ssl3;
>+        else if (rangeString.equals("tlsv1.0"))
>+            return org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_0;
>+        else if (rangeString.equals("tlsv1.1"))
>+            return org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_1;
>+
>+        return -1;
>+    }
>+
>+ 
>+
>     void init() throws IOException {
>         try {
>             String deb = (String)attributes.get("debug");
>@@ -502,7 +549,15 @@ public class JSSSocketFactory
>             // 12 hours = 43200 seconds
>             SSLServerSocket.configServerSessionIDCache(0, 43200, 43200, null);
> 
>-            setSSLOptions();
>+            String sslVersionRange = (String)attributes.get("sslVersionRange");
>+            if ((sslVersionRange != null) && !sslVersionRange.equals("")) {
>+                setSSLVersionRangeDefault(sslVersionRange);
>+                debugWrite("SSSocketFactory init - after setSSLVersionRangeDefault()\n");
>+            } else {
>+                setSSLOptions();
>+                debugWrite("SSSocketFactory init - after setSSLOptions()\n");
>+            }
>+
>         } catch (Exception ex) {
>             debugWrite("JSSSocketFactory init - exception thrown:"+
>                    ex.toString()+"\n");

Actions: View | Diff

Attachments on bug 871171: 635773 | 954116 | 956851 | 957715 | 961442