Author: markt
Date: Wed Apr 12 09:15:46 2017
New Revision: 1791095
URL: http://svn.apache.org/viewvc?rev=1791095&view=rev
Log:
Align with OpenSSL Master
Remove ECDH(E) ciphers from SSLv3
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.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=1791095&r1=1791094&r2=1791095&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
Wed Apr 12 09:15:46 2017
@@ -2728,7 +2728,7 @@ public enum Cipher {
Authentication.ECDH,
Encryption.RC4,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.MEDIUM,
false,
@@ -2796,7 +2796,7 @@ public enum Cipher {
Authentication.ECDSA,
Encryption.eNULL,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.STRONG_NONE,
true,
@@ -2830,7 +2830,7 @@ public enum Cipher {
Authentication.ECDSA,
Encryption.TRIPLE_DES,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.MEDIUM,
true,
@@ -2847,7 +2847,7 @@ public enum Cipher {
Authentication.ECDSA,
Encryption.AES128,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.HIGH,
true,
@@ -2864,7 +2864,7 @@ public enum Cipher {
Authentication.ECDSA,
Encryption.AES256,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.HIGH,
true,
@@ -2966,7 +2966,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.eNULL,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.STRONG_NONE,
true,
@@ -2983,7 +2983,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.RC4,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.MEDIUM,
false,
@@ -3000,7 +3000,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.TRIPLE_DES,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.MEDIUM,
true,
@@ -3017,7 +3017,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.AES128,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.HIGH,
true,
@@ -3034,7 +3034,7 @@ public enum Cipher {
Authentication.RSA,
Encryption.AES256,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.HIGH,
true,
@@ -3051,7 +3051,7 @@ public enum Cipher {
Authentication.aNULL,
Encryption.eNULL,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.STRONG_NONE,
true,
@@ -3068,7 +3068,7 @@ public enum Cipher {
Authentication.aNULL,
Encryption.RC4,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.MEDIUM,
false,
@@ -3085,7 +3085,7 @@ public enum Cipher {
Authentication.aNULL,
Encryption.TRIPLE_DES,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.MEDIUM,
true,
@@ -3102,7 +3102,7 @@ public enum Cipher {
Authentication.aNULL,
Encryption.AES128,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.HIGH,
true,
@@ -3119,7 +3119,7 @@ public enum Cipher {
Authentication.aNULL,
Encryption.AES256,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.HIGH,
true,
@@ -3564,7 +3564,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.RC4,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.MEDIUM,
false,
@@ -3581,7 +3581,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.TRIPLE_DES,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.MEDIUM,
true,
@@ -3598,7 +3598,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.AES128,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.HIGH,
true,
@@ -3615,7 +3615,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.AES256,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.HIGH,
true,
@@ -3664,7 +3664,7 @@ public enum Cipher {
Authentication.PSK,
Encryption.eNULL,
MessageDigest.SHA1,
- Protocol.SSLv3,
+ Protocol.TLSv1,
false,
EncryptionLevel.STRONG_NONE,
true,
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
