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 22:15:54 UTC
svn commit: r1714379 - in /tomcat/tc8.0.x/trunk:
java/org/apache/tomcat/util/net/
java/org/apache/tomcat/util/net/jsse/openssl/
test/org/apache/tomcat/util/net/jsse/openssl/
Author: markt
Date: Sat Nov 14 21:15:53 2015
New Revision: 1714379
URL: http://svn.apache.org/viewvc?rev=1714379&view=rev
Log:
Back-port TLSv1 / SSLv3 changes from trunk
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Constants.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java
tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Constants.java?rev=1714379&r1=1714378&r2=1714379&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Constants.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/Constants.java Sat Nov 14 21:15:53 2015
@@ -38,6 +38,8 @@ public class Constants {
public static final String SSL_PROTO_TLS = "TLS";
public static final String SSL_PROTO_TLSv1_2 = "TLSv1.2";
public static final String SSL_PROTO_TLSv1_1 = "TLSv1.1";
+ // Two different forms for TLS 1.0
+ public static final String SSL_PROTO_TLSv1_0 = "TLSv1.0";
public static final String SSL_PROTO_TLSv1 = "TLSv1";
public static final String SSL_PROTO_SSLv3 = "SSLv3";
public static final String SSL_PROTO_SSLv2 = "SSLv2";
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1714379&r1=1714378&r2=1714379&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Sat Nov 14 21:15:53 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,
@@ -1575,7 +1575,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.CAMELLIA256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
false,
@@ -1592,7 +1592,7 @@ public enum Cipher {
Authentication.DH,
Encryption.CAMELLIA256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
false,
@@ -1609,7 +1609,7 @@ public enum Cipher {
Authentication.DH,
Encryption.CAMELLIA256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
false,
@@ -1626,7 +1626,7 @@ public enum Cipher {
Authentication.DSS,
Encryption.CAMELLIA256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
false,
@@ -1643,7 +1643,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.CAMELLIA256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
false,
@@ -1660,7 +1660,7 @@ public enum Cipher {
Authentication.aNULL,
Encryption.CAMELLIA256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
false,
@@ -1677,7 +1677,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.RC4,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.MEDIUM,
false,
@@ -1694,7 +1694,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.TRIPLE_DES,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -1711,7 +1711,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.AES128,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -1728,7 +1728,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.AES256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -1745,7 +1745,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.RC4,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.MEDIUM,
false,
@@ -1762,7 +1762,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.TRIPLE_DES,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -1779,7 +1779,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.AES128,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -1796,7 +1796,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.AES256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -1813,7 +1813,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.RC4,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.MEDIUM,
false,
@@ -1830,7 +1830,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.TRIPLE_DES,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -1847,7 +1847,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.AES128,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -1864,7 +1864,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.AES256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -1882,7 +1882,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.SEED,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.MEDIUM,
false,
@@ -1899,7 +1899,7 @@ public enum Cipher {
Authentication.DH,
Encryption.SEED,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.MEDIUM,
false,
@@ -1916,7 +1916,7 @@ public enum Cipher {
Authentication.DH,
Encryption.SEED,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.MEDIUM,
false,
@@ -1933,7 +1933,7 @@ public enum Cipher {
Authentication.DSS,
Encryption.SEED,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.MEDIUM,
false,
@@ -1950,7 +1950,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.SEED,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.MEDIUM,
false,
@@ -1967,7 +1967,7 @@ public enum Cipher {
Authentication.aNULL,
Encryption.SEED,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.MEDIUM,
false,
@@ -2709,7 +2709,7 @@ public enum Cipher {
Authentication.ECDH,
Encryption.eNULL,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.STRONG_NONE,
true,
@@ -2726,7 +2726,7 @@ public enum Cipher {
Authentication.ECDH,
Encryption.RC4,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.MEDIUM,
false,
@@ -2743,7 +2743,7 @@ public enum Cipher {
Authentication.ECDH,
Encryption.TRIPLE_DES,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -2760,7 +2760,7 @@ public enum Cipher {
Authentication.ECDH,
Encryption.AES128,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -2777,7 +2777,7 @@ public enum Cipher {
Authentication.ECDH,
Encryption.AES256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -2794,7 +2794,7 @@ public enum Cipher {
Authentication.ECDSA,
Encryption.eNULL,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.STRONG_NONE,
true,
@@ -2811,7 +2811,7 @@ public enum Cipher {
Authentication.ECDSA,
Encryption.RC4,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.MEDIUM,
false,
@@ -2828,7 +2828,7 @@ public enum Cipher {
Authentication.ECDSA,
Encryption.TRIPLE_DES,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -2845,7 +2845,7 @@ public enum Cipher {
Authentication.ECDSA,
Encryption.AES128,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -2862,7 +2862,7 @@ public enum Cipher {
Authentication.ECDSA,
Encryption.AES256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -2879,7 +2879,7 @@ public enum Cipher {
Authentication.ECDH,
Encryption.eNULL,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.STRONG_NONE,
true,
@@ -2896,7 +2896,7 @@ public enum Cipher {
Authentication.ECDH,
Encryption.RC4,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.MEDIUM,
false,
@@ -2913,7 +2913,7 @@ public enum Cipher {
Authentication.ECDH,
Encryption.TRIPLE_DES,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -2930,7 +2930,7 @@ public enum Cipher {
Authentication.ECDH,
Encryption.AES128,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -2947,7 +2947,7 @@ public enum Cipher {
Authentication.ECDH,
Encryption.AES256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -2964,7 +2964,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.eNULL,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.STRONG_NONE,
true,
@@ -2981,7 +2981,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.RC4,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.MEDIUM,
false,
@@ -2998,7 +2998,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.TRIPLE_DES,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -3015,7 +3015,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.AES128,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -3032,7 +3032,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.AES256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -3049,7 +3049,7 @@ public enum Cipher {
Authentication.aNULL,
Encryption.eNULL,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.STRONG_NONE,
true,
@@ -3066,7 +3066,7 @@ public enum Cipher {
Authentication.aNULL,
Encryption.RC4,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.MEDIUM,
false,
@@ -3083,7 +3083,7 @@ public enum Cipher {
Authentication.aNULL,
Encryption.TRIPLE_DES,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -3100,7 +3100,7 @@ public enum Cipher {
Authentication.aNULL,
Encryption.AES128,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -3117,7 +3117,7 @@ public enum Cipher {
Authentication.aNULL,
Encryption.AES256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -3135,7 +3135,7 @@ public enum Cipher {
Authentication.SRP,
Encryption.TRIPLE_DES,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
false,
@@ -3152,7 +3152,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.TRIPLE_DES,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
false,
@@ -3169,7 +3169,7 @@ public enum Cipher {
Authentication.DSS,
Encryption.TRIPLE_DES,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
false,
@@ -3186,7 +3186,7 @@ public enum Cipher {
Authentication.SRP,
Encryption.AES128,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
false,
@@ -3203,7 +3203,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.AES128,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
false,
@@ -3220,7 +3220,7 @@ public enum Cipher {
Authentication.DSS,
Encryption.AES128,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
false,
@@ -3237,7 +3237,7 @@ public enum Cipher {
Authentication.SRP,
Encryption.AES256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
false,
@@ -3254,7 +3254,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.AES256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
false,
@@ -3271,7 +3271,7 @@ public enum Cipher {
Authentication.DSS,
Encryption.AES256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
false,
@@ -3562,7 +3562,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.RC4,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.MEDIUM,
false,
@@ -3579,7 +3579,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.TRIPLE_DES,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -3596,7 +3596,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.AES128,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -3613,7 +3613,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.AES256,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.HIGH,
true,
@@ -3662,7 +3662,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.eNULL,
MessageDigest.SHA1,
- Protocol.TLSv1,
+ Protocol.SSLv3,
false,
EncryptionLevel.STRONG_NONE,
true,
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java?rev=1714379&r1=1714378&r2=1714379&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Protocol.java Sat Nov 14 21:15:53 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_0),
TLSv1_2(Constants.SSL_PROTO_TLSv1_2);
private final String openSSLName;
Modified: tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1714379&r1=1714378&r2=1714379&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java (original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java Sat Nov 14 21:15:53 2015
@@ -27,7 +27,6 @@ import org.junit.Test;
public class TestCipher {
-
/*
* Checks that every cipher suite returned by OpenSSL is mapped to at least
* one cipher suite that is recognised by JSSE or is a cipher suite known
@@ -368,8 +367,8 @@ public class TestCipher {
"DHE-PSK-AES128-CCM8+TLSv1.2",
"DHE-PSK-AES256-CCM+TLSv1.2",
"DHE-PSK-AES256-CCM8+TLSv1.2",
- "DHE-PSK-CAMELLIA128-SHA256+SSLv3",
- "DHE-PSK-CAMELLIA256-SHA384+SSLv3",
+ "DHE-PSK-CAMELLIA128-SHA256+TLSv1.0",
+ "DHE-PSK-CAMELLIA256-SHA384+TLSv1.0",
"DHE-RSA-AES128-CCM+TLSv1.2",
"DHE-RSA-AES128-CCM8+TLSv1.2",
"DHE-RSA-AES256-CCM+TLSv1.2",
@@ -384,8 +383,8 @@ public class TestCipher {
"ECDHE-ECDSA-AES256-CCM8+TLSv1.2",
"ECDHE-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDHE-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
- "ECDHE-PSK-CAMELLIA128-SHA256+SSLv3",
- "ECDHE-PSK-CAMELLIA256-SHA384+SSLv3",
+ "ECDHE-PSK-CAMELLIA128-SHA256+TLSv1.0",
+ "ECDHE-PSK-CAMELLIA256-SHA384+TLSv1.0",
"ECDHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDHE-RSA-CAMELLIA256-SHA384+TLSv1.2",
"EXP-RC2-CBC-MD5+SSLv2",
@@ -395,12 +394,12 @@ public class TestCipher {
"PSK-AES128-CCM8+TLSv1.2",
"PSK-AES256-CCM+TLSv1.2",
"PSK-AES256-CCM8+TLSv1.2",
- "PSK-CAMELLIA128-SHA256+SSLv3",
- "PSK-CAMELLIA256-SHA384+SSLv3",
+ "PSK-CAMELLIA128-SHA256+TLSv1.0",
+ "PSK-CAMELLIA256-SHA384+TLSv1.0",
"RC2-CBC-MD5+SSLv2",
"RC4-MD5+SSLv2",
- "RSA-PSK-CAMELLIA128-SHA256+SSLv3",
- "RSA-PSK-CAMELLIA256-SHA384+SSLv3")));
+ "RSA-PSK-CAMELLIA128-SHA256+TLSv1.0",
+ "RSA-PSK-CAMELLIA256-SHA384+TLSv1.0")));
/**
@@ -585,20 +584,20 @@ public class TestCipher {
"DHE-DSS-SEED-SHA+SSLv3",
"DHE-PSK-3DES-EDE-CBC-SHA+SSLv3",
"DHE-PSK-AES128-CBC-SHA+SSLv3",
- "DHE-PSK-AES128-CBC-SHA256+SSLv3",
+ "DHE-PSK-AES128-CBC-SHA256+TLSv1.0",
"DHE-PSK-AES128-CCM+TLSv1.2",
"DHE-PSK-AES128-CCM8+TLSv1.2",
"DHE-PSK-AES128-GCM-SHA256+TLSv1.2",
"DHE-PSK-AES256-CBC-SHA+SSLv3",
- "DHE-PSK-AES256-CBC-SHA384+SSLv3",
+ "DHE-PSK-AES256-CBC-SHA384+TLSv1.0",
"DHE-PSK-AES256-CCM+TLSv1.2",
"DHE-PSK-AES256-CCM8+TLSv1.2",
"DHE-PSK-AES256-GCM-SHA384+TLSv1.2",
- "DHE-PSK-CAMELLIA128-SHA256+SSLv3",
- "DHE-PSK-CAMELLIA256-SHA384+SSLv3",
+ "DHE-PSK-CAMELLIA128-SHA256+TLSv1.0",
+ "DHE-PSK-CAMELLIA256-SHA384+TLSv1.0",
"DHE-PSK-NULL-SHA+SSLv3",
- "DHE-PSK-NULL-SHA256+SSLv3",
- "DHE-PSK-NULL-SHA384+SSLv3",
+ "DHE-PSK-NULL-SHA256+TLSv1.0",
+ "DHE-PSK-NULL-SHA384+TLSv1.0",
"DHE-PSK-RC4-SHA+SSLv3",
"DHE-RSA-AES128-CCM+TLSv1.2",
"DHE-RSA-AES128-CCM8+TLSv1.2",
@@ -621,14 +620,14 @@ public class TestCipher {
"ECDHE-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDHE-PSK-3DES-EDE-CBC-SHA+SSLv3",
"ECDHE-PSK-AES128-CBC-SHA+SSLv3",
- "ECDHE-PSK-AES128-CBC-SHA256+SSLv3",
+ "ECDHE-PSK-AES128-CBC-SHA256+TLSv1.0",
"ECDHE-PSK-AES256-CBC-SHA+SSLv3",
- "ECDHE-PSK-AES256-CBC-SHA384+SSLv3",
- "ECDHE-PSK-CAMELLIA128-SHA256+SSLv3",
- "ECDHE-PSK-CAMELLIA256-SHA384+SSLv3",
+ "ECDHE-PSK-AES256-CBC-SHA384+TLSv1.0",
+ "ECDHE-PSK-CAMELLIA128-SHA256+TLSv1.0",
+ "ECDHE-PSK-CAMELLIA256-SHA384+TLSv1.0",
"ECDHE-PSK-NULL-SHA+SSLv3",
- "ECDHE-PSK-NULL-SHA256+SSLv3",
- "ECDHE-PSK-NULL-SHA384+SSLv3",
+ "ECDHE-PSK-NULL-SHA256+TLSv1.0",
+ "ECDHE-PSK-NULL-SHA384+TLSv1.0",
"ECDHE-PSK-RC4-SHA+SSLv3",
"ECDHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDHE-RSA-CAMELLIA256-SHA384+TLSv1.2",
@@ -640,35 +639,35 @@ public class TestCipher {
"IDEA-CBC-SHA+SSLv3",
"PSK-3DES-EDE-CBC-SHA+SSLv3",
"PSK-AES128-CBC-SHA+SSLv3",
- "PSK-AES128-CBC-SHA256+SSLv3",
+ "PSK-AES128-CBC-SHA256+TLSv1.0",
"PSK-AES128-CCM+TLSv1.2",
"PSK-AES128-CCM8+TLSv1.2",
"PSK-AES128-GCM-SHA256+TLSv1.2",
"PSK-AES256-CBC-SHA+SSLv3",
- "PSK-AES256-CBC-SHA384+SSLv3",
+ "PSK-AES256-CBC-SHA384+TLSv1.0",
"PSK-AES256-CCM+TLSv1.2",
"PSK-AES256-CCM8+TLSv1.2",
"PSK-AES256-GCM-SHA384+TLSv1.2",
- "PSK-CAMELLIA128-SHA256+SSLv3",
- "PSK-CAMELLIA256-SHA384+SSLv3",
+ "PSK-CAMELLIA128-SHA256+TLSv1.0",
+ "PSK-CAMELLIA256-SHA384+TLSv1.0",
"PSK-NULL-SHA+SSLv3",
- "PSK-NULL-SHA256+SSLv3",
- "PSK-NULL-SHA384+SSLv3",
+ "PSK-NULL-SHA256+TLSv1.0",
+ "PSK-NULL-SHA384+TLSv1.0",
"PSK-RC4-SHA+SSLv3",
"RC2-CBC-MD5+SSLv2",
"RC4-MD5+SSLv2",
"RSA-PSK-3DES-EDE-CBC-SHA+SSLv3",
"RSA-PSK-AES128-CBC-SHA+SSLv3",
- "RSA-PSK-AES128-CBC-SHA256+SSLv3",
+ "RSA-PSK-AES128-CBC-SHA256+TLSv1.0",
"RSA-PSK-AES128-GCM-SHA256+TLSv1.2",
"RSA-PSK-AES256-CBC-SHA+SSLv3",
- "RSA-PSK-AES256-CBC-SHA384+SSLv3",
+ "RSA-PSK-AES256-CBC-SHA384+TLSv1.0",
"RSA-PSK-AES256-GCM-SHA384+TLSv1.2",
- "RSA-PSK-CAMELLIA128-SHA256+SSLv3",
- "RSA-PSK-CAMELLIA256-SHA384+SSLv3",
+ "RSA-PSK-CAMELLIA128-SHA256+TLSv1.0",
+ "RSA-PSK-CAMELLIA256-SHA384+TLSv1.0",
"RSA-PSK-NULL-SHA+SSLv3",
- "RSA-PSK-NULL-SHA256+SSLv3",
- "RSA-PSK-NULL-SHA384+SSLv3",
+ "RSA-PSK-NULL-SHA256+TLSv1.0",
+ "RSA-PSK-NULL-SHA384+TLSv1.0",
"RSA-PSK-RC4-SHA+SSLv3",
"SEED-SHA+SSLv3",
"SRP-AES-128-CBC-SHA+SSLv3",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org