You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/11/14 21:40:07 UTC

svn commit: r1714363 - in /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers: Cipher.java Protocol.java

Author: markt
Date: Sat Nov 14 20:40:07 2015
New Revision: 1714363

URL: http://svn.apache.org/viewvc?rev=1714363&view=rev
Log:
SSLv3 / TLSv1 updates from OpenSSL master
More to follow

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java
    tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Protocol.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java?rev=1714363&r1=1714362&r2=1714363&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java Sat Nov 14 20:40:07 2015
@@ -801,7 +801,7 @@ public enum Cipher {
             Authentication.PSK,
             Encryption.eNULL,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.STRONG_NONE,
             true,
@@ -818,7 +818,7 @@ public enum Cipher {
             Authentication.PSK,
             Encryption.eNULL,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.STRONG_NONE,
             true,
@@ -835,7 +835,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.eNULL,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.STRONG_NONE,
             true,
@@ -853,7 +853,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -870,7 +870,7 @@ public enum Cipher {
             Authentication.DH,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -887,7 +887,7 @@ public enum Cipher {
             Authentication.DH,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -904,7 +904,7 @@ public enum Cipher {
             Authentication.DSS,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -921,7 +921,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -938,7 +938,7 @@ public enum Cipher {
             Authentication.aNULL,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -955,7 +955,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -972,7 +972,7 @@ public enum Cipher {
             Authentication.DH,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -989,7 +989,7 @@ public enum Cipher {
             Authentication.DH,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -1006,7 +1006,7 @@ public enum Cipher {
             Authentication.DSS,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -1023,7 +1023,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -1040,7 +1040,7 @@ public enum Cipher {
             Authentication.aNULL,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -1162,7 +1162,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.CAMELLIA128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -1179,7 +1179,7 @@ public enum Cipher {
             Authentication.DH,
             Encryption.CAMELLIA128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -1196,7 +1196,7 @@ public enum Cipher {
             Authentication.DH,
             Encryption.CAMELLIA128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -1213,7 +1213,7 @@ public enum Cipher {
             Authentication.DSS,
             Encryption.CAMELLIA128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -1230,7 +1230,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.CAMELLIA128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -1247,7 +1247,7 @@ public enum Cipher {
             Authentication.aNULL,
             Encryption.CAMELLIA128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -1576,7 +1576,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.CAMELLIA256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -1593,7 +1593,7 @@ public enum Cipher {
             Authentication.DH,
             Encryption.CAMELLIA256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -1610,7 +1610,7 @@ public enum Cipher {
             Authentication.DH,
             Encryption.CAMELLIA256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -1627,7 +1627,7 @@ public enum Cipher {
             Authentication.DSS,
             Encryption.CAMELLIA256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -1644,7 +1644,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.CAMELLIA256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -1661,7 +1661,7 @@ public enum Cipher {
             Authentication.aNULL,
             Encryption.CAMELLIA256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -1678,7 +1678,7 @@ public enum Cipher {
             Authentication.PSK,
             Encryption.RC4,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.MEDIUM,
             false,
@@ -1695,7 +1695,7 @@ public enum Cipher {
             Authentication.PSK,
             Encryption.TRIPLE_DES,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -1712,7 +1712,7 @@ public enum Cipher {
             Authentication.PSK,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -1729,7 +1729,7 @@ public enum Cipher {
             Authentication.PSK,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -1746,7 +1746,7 @@ public enum Cipher {
             Authentication.PSK,
             Encryption.RC4,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.MEDIUM,
             false,
@@ -1763,7 +1763,7 @@ public enum Cipher {
             Authentication.PSK,
             Encryption.TRIPLE_DES,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -1780,7 +1780,7 @@ public enum Cipher {
             Authentication.PSK,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -1797,7 +1797,7 @@ public enum Cipher {
             Authentication.PSK,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -1814,7 +1814,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.RC4,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.MEDIUM,
             false,
@@ -1831,7 +1831,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.TRIPLE_DES,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -1848,7 +1848,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -1865,7 +1865,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -1883,7 +1883,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.SEED,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.MEDIUM,
             false,
@@ -1900,7 +1900,7 @@ public enum Cipher {
             Authentication.DH,
             Encryption.SEED,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.MEDIUM,
             false,
@@ -1917,7 +1917,7 @@ public enum Cipher {
             Authentication.DH,
             Encryption.SEED,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.MEDIUM,
             false,
@@ -1934,7 +1934,7 @@ public enum Cipher {
             Authentication.DSS,
             Encryption.SEED,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.MEDIUM,
             false,
@@ -1951,7 +1951,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.SEED,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.MEDIUM,
             false,
@@ -1968,7 +1968,7 @@ public enum Cipher {
             Authentication.aNULL,
             Encryption.SEED,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.MEDIUM,
             false,
@@ -2710,7 +2710,7 @@ public enum Cipher {
             Authentication.ECDH,
             Encryption.eNULL,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.STRONG_NONE,
             true,
@@ -2727,7 +2727,7 @@ public enum Cipher {
             Authentication.ECDH,
             Encryption.RC4,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.MEDIUM,
             false,
@@ -2744,7 +2744,7 @@ public enum Cipher {
             Authentication.ECDH,
             Encryption.TRIPLE_DES,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -2761,7 +2761,7 @@ public enum Cipher {
             Authentication.ECDH,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -2778,7 +2778,7 @@ public enum Cipher {
             Authentication.ECDH,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -2795,7 +2795,7 @@ public enum Cipher {
             Authentication.ECDSA,
             Encryption.eNULL,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.STRONG_NONE,
             true,
@@ -2812,7 +2812,7 @@ public enum Cipher {
             Authentication.ECDSA,
             Encryption.RC4,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.MEDIUM,
             false,
@@ -2829,7 +2829,7 @@ public enum Cipher {
             Authentication.ECDSA,
             Encryption.TRIPLE_DES,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -2846,7 +2846,7 @@ public enum Cipher {
             Authentication.ECDSA,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -2863,7 +2863,7 @@ public enum Cipher {
             Authentication.ECDSA,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -2880,7 +2880,7 @@ public enum Cipher {
             Authentication.ECDH,
             Encryption.eNULL,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.STRONG_NONE,
             true,
@@ -2897,7 +2897,7 @@ public enum Cipher {
             Authentication.ECDH,
             Encryption.RC4,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.MEDIUM,
             false,
@@ -2914,7 +2914,7 @@ public enum Cipher {
             Authentication.ECDH,
             Encryption.TRIPLE_DES,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -2931,7 +2931,7 @@ public enum Cipher {
             Authentication.ECDH,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -2948,7 +2948,7 @@ public enum Cipher {
             Authentication.ECDH,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -2965,7 +2965,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.eNULL,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.STRONG_NONE,
             true,
@@ -2982,7 +2982,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.RC4,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.MEDIUM,
             false,
@@ -2999,7 +2999,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.TRIPLE_DES,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -3016,7 +3016,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -3033,7 +3033,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -3050,7 +3050,7 @@ public enum Cipher {
             Authentication.aNULL,
             Encryption.eNULL,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.STRONG_NONE,
             true,
@@ -3067,7 +3067,7 @@ public enum Cipher {
             Authentication.aNULL,
             Encryption.RC4,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.MEDIUM,
             false,
@@ -3084,7 +3084,7 @@ public enum Cipher {
             Authentication.aNULL,
             Encryption.TRIPLE_DES,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -3101,7 +3101,7 @@ public enum Cipher {
             Authentication.aNULL,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -3118,7 +3118,7 @@ public enum Cipher {
             Authentication.aNULL,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -3136,7 +3136,7 @@ public enum Cipher {
             Authentication.SRP,
             Encryption.TRIPLE_DES,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -3153,7 +3153,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.TRIPLE_DES,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -3170,7 +3170,7 @@ public enum Cipher {
             Authentication.DSS,
             Encryption.TRIPLE_DES,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -3187,7 +3187,7 @@ public enum Cipher {
             Authentication.SRP,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -3204,7 +3204,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -3221,7 +3221,7 @@ public enum Cipher {
             Authentication.DSS,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -3238,7 +3238,7 @@ public enum Cipher {
             Authentication.SRP,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -3255,7 +3255,7 @@ public enum Cipher {
             Authentication.RSA,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -3272,7 +3272,7 @@ public enum Cipher {
             Authentication.DSS,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             false,
@@ -3563,7 +3563,7 @@ public enum Cipher {
             Authentication.PSK,
             Encryption.RC4,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.MEDIUM,
             false,
@@ -3580,7 +3580,7 @@ public enum Cipher {
             Authentication.PSK,
             Encryption.TRIPLE_DES,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -3597,7 +3597,7 @@ public enum Cipher {
             Authentication.PSK,
             Encryption.AES128,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -3614,7 +3614,7 @@ public enum Cipher {
             Authentication.PSK,
             Encryption.AES256,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -3631,7 +3631,7 @@ public enum Cipher {
             Authentication.PSK,
             Encryption.AES128,
             MessageDigest.SHA256,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -3647,7 +3647,7 @@ public enum Cipher {
             Authentication.PSK,
             Encryption.AES256,
             MessageDigest.SHA384,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.HIGH,
             true,
@@ -3663,7 +3663,7 @@ public enum Cipher {
             Authentication.PSK,
             Encryption.eNULL,
             MessageDigest.SHA1,
-            Protocol.TLSv1,
+            Protocol.SSLv3,
             false,
             EncryptionLevel.STRONG_NONE,
             true,

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Protocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Protocol.java?rev=1714363&r1=1714362&r2=1714363&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Protocol.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Protocol.java Sat Nov 14 20:40:07 2015
@@ -23,7 +23,7 @@ enum Protocol {
 
     SSLv3(Constants.SSL_PROTO_SSLv3),
     SSLv2(Constants.SSL_PROTO_SSLv2),
-    TLSv1(Constants.SSL_PROTO_SSLv3),
+    TLSv1(Constants.SSL_PROTO_TLSv1),
     TLSv1_2(Constants.SSL_PROTO_TLSv1_2);
 
     private final String openSSLName;



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