Description: Use TLS in SSL unit tests
Author: Miguel Landaeta <nomadium@debian.org>
Bug-Debian: https://bugs.debian.org/780519
Forwarded: no
Last-Update: 2015-03-24

--- tomcat7-7.0.56.orig/test/org/apache/tomcat/util/net/TesterSupport.java
+++ tomcat7-7.0.56/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -317,7 +317,7 @@ public final class TesterSupport {
                 throws IOException {
             SSLSocket result =
                 (SSLSocket) factory.createSocket(socket, s, i, flag);
-            result.setEnabledProtocols(new String[] { "SSLv3" } );
+            result.setEnabledProtocols(new String[] { "TLSv1" } );
             return result;
         }
 
@@ -325,7 +325,7 @@ public final class TesterSupport {
         public Socket createSocket(String s, int i) throws IOException,
                 UnknownHostException {
             SSLSocket result = (SSLSocket) factory.createSocket(s, i);
-            result.setEnabledProtocols(new String[] { "SSLv3" } );
+            result.setEnabledProtocols(new String[] { "TLSv1" } );
             return result;
         }
 
@@ -334,7 +334,7 @@ public final class TesterSupport {
                 int j) throws IOException, UnknownHostException {
             SSLSocket result =
                 (SSLSocket) factory.createSocket(s, i, inetaddress, j);
-            result.setEnabledProtocols(new String[] { "SSLv3" } );
+            result.setEnabledProtocols(new String[] { "TLSv1" } );
             return result;
         }
 
@@ -342,7 +342,7 @@ public final class TesterSupport {
         public Socket createSocket(InetAddress inetaddress, int i)
                 throws IOException {
             SSLSocket result = (SSLSocket) factory.createSocket(inetaddress, i);
-            result.setEnabledProtocols(new String[] { "SSLv3" } );
+            result.setEnabledProtocols(new String[] { "TLSv1" } );
             return result;
         }
 
@@ -351,7 +351,7 @@ public final class TesterSupport {
                 InetAddress inetaddress1, int j) throws IOException {
             SSLSocket result = (SSLSocket) factory.createSocket(
                     inetaddress, i, inetaddress1, j);
-            result.setEnabledProtocols(new String[] { "SSLv3" } );
+            result.setEnabledProtocols(new String[] { "TLSv1" } );
             return result;
         }
     }
