tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1742510 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java
Date Fri, 06 May 2016 07:42:29 GMT
Author: markt
Date: Fri May  6 07:42:29 2016
New Revision: 1742510

URL: http://svn.apache.org/viewvc?rev=1742510&view=rev
Log:
OpenSSL has re-classified 3DES from HIGH to MEDIUM

Modified:
    tomcat/tc8.5.x/trunk/   (props changed)
    tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java

Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May  6 07:42:29 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
 ,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
 ,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509

Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java?rev=1742510&r1=1742509&r2=1742510&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java Fri May
 6 07:42:29 2016
@@ -215,7 +215,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             true,
             112,
             168,
@@ -267,7 +267,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             true,
             112,
             168,
@@ -318,7 +318,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             true,
             112,
             168,
@@ -370,7 +370,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             true,
             112,
             168,
@@ -421,7 +421,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             true,
             112,
             168,
@@ -506,7 +506,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             true,
             112,
             168,
@@ -1698,7 +1698,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             true,
             112,
             168,
@@ -1766,7 +1766,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             true,
             112,
             168,
@@ -1834,7 +1834,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             true,
             112,
             168,
@@ -2747,7 +2747,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             true,
             112,
             168,
@@ -2832,7 +2832,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             true,
             112,
             168,
@@ -2917,7 +2917,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             true,
             112,
             168,
@@ -3002,7 +3002,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             true,
             112,
             168,
@@ -3087,7 +3087,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             true,
             112,
             168,
@@ -3139,7 +3139,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             false,
             112,
             168,
@@ -3156,7 +3156,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             false,
             112,
             168,
@@ -3173,7 +3173,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             false,
             112,
             168,
@@ -3583,7 +3583,7 @@ public enum Cipher {
             MessageDigest.SHA1,
             Protocol.SSLv3,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             true,
             112,
             168,
@@ -4555,7 +4555,7 @@ public enum Cipher {
             MessageDigest.MD5,
             Protocol.SSLv2,
             false,
-            EncryptionLevel.HIGH,
+            EncryptionLevel.MEDIUM,
             false,
             112,
             168,



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


Mime
View raw message