svn commit: r1819054 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java

2017-12-22 Thread markt 
Author: markt
Date: Fri Dec 22 16:25:21 2017
New Revision: 1819054

URL: http://svn.apache.org/viewvc?rev=1819054&view=rev
Log:
Use correct format for names of unsupported ciphers

Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java?rev=1819054&r1=1819053&r2=1819054&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java 
Fri Dec 22 16:25:21 2017
@@ -373,18 +373,18 @@ public class TestCipher {
 "AES128-CCM8+TLSv1.2",
 "AES256-CCM+TLSv1.2",
 "AES256-CCM8+TLSv1.2",
-"ARIA128-GCM-SHA256",
-"ARIA256-GCM-SHA384",
+"ARIA128-GCM-SHA256+TLSv1.2",
+"ARIA256-GCM-SHA384+TLSv1.2",
 "DES-CBC-MD5+SSLv2",
 "DES-CBC3-MD5+SSLv2",
-"DHE-DSS-ARIA128-GCM-SHA256",
-"DHE-DSS-ARIA256-GCM-SHA384",
+"DHE-DSS-ARIA128-GCM-SHA256+TLSv1.2",
+"DHE-DSS-ARIA256-GCM-SHA384+TLSv1.2",
 "DHE-PSK-AES128-CCM+TLSv1.2",
 "DHE-PSK-AES128-CCM8+TLSv1.2",
 "DHE-PSK-AES256-CCM+TLSv1.2",
 "DHE-PSK-AES256-CCM8+TLSv1.2",
-"DHE-PSK-ARIA128-GCM-SHA256",
-"DHE-PSK-ARIA256-GCM-SHA384",
+"DHE-PSK-ARIA128-GCM-SHA256+TLSv1.2",
+"DHE-PSK-ARIA256-GCM-SHA384+TLSv1.2",
 "DHE-PSK-CAMELLIA128-SHA256+TLSv1",
 "DHE-PSK-CAMELLIA256-SHA384+TLSv1",
 "DHE-PSK-CHACHA20-POLY1305+TLSv1.2",
@@ -392,10 +392,10 @@ public class TestCipher {
 "DHE-RSA-AES128-CCM8+TLSv1.2",
 "DHE-RSA-AES256-CCM+TLSv1.2",
 "DHE-RSA-AES256-CCM8+TLSv1.2",
-"DHE-RSA-ARIA128-GCM-SHA256",
-"DHE-RSA-ARIA256-GCM-SHA384",
-"ECDHE-ARIA128-GCM-SHA256",
-"ECDHE-ARIA256-GCM-SHA384",
+"DHE-RSA-ARIA128-GCM-SHA256+TLSv1.2",
+"DHE-RSA-ARIA256-GCM-SHA384+TLSv1.2",
+"ECDHE-ARIA128-GCM-SHA256+TLSv1.2",
+"ECDHE-ARIA256-GCM-SHA384+TLSv1.2",
 "DHE-RSA-CHACHA20-POLY1305+TLSv1.2",
 "ECDH-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
 "ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
@@ -405,8 +405,8 @@ public class TestCipher {
 "ECDHE-ECDSA-AES128-CCM8+TLSv1.2",
 "ECDHE-ECDSA-AES256-CCM+TLSv1.2",
 "ECDHE-ECDSA-AES256-CCM8+TLSv1.2",
-"ECDHE-ECDSA-ARIA128-GCM-SHA256",
-"ECDHE-ECDSA-ARIA256-GCM-SHA384",
+"ECDHE-ECDSA-ARIA128-GCM-SHA256+TLSv1.2",
+"ECDHE-ECDSA-ARIA256-GCM-SHA384+TLSv1.2",
 "ECDHE-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
 "ECDHE-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
 "ECDHE-ECDSA-CHACHA20-POLY1305+TLSv1.2",
@@ -423,15 +423,15 @@ public class TestCipher {
 "PSK-AES128-CCM8+TLSv1.2",
 "PSK-AES256-CCM+TLSv1.2",
 "PSK-AES256-CCM8+TLSv1.2",
-"PSK-ARIA128-GCM-SHA256",
-"PSK-ARIA256-GCM-SHA384",
+"PSK-ARIA128-GCM-SHA256+TLSv1.2",
+"PSK-ARIA256-GCM-SHA384+TLSv1.2",
 "PSK-CAMELLIA128-SHA256+TLSv1",
 "PSK-CAMELLIA256-SHA384+TLSv1",
 "PSK-CHACHA20-POLY1305+TLSv1.2",
 "RC2-CBC-MD5+SSLv2",
 "RC4-MD5+SSLv2",
-"RSA-PSK-ARIA128-GCM-SHA256",
-"RSA-PSK-ARIA256-GCM-SHA384",
+"RSA-PSK-ARIA128-GCM-SHA256+TLSv1.2",
+"RSA-PSK-ARIA256-GCM-SHA384+TLSv1.2",
 "RSA-PSK-CAMELLIA128-SHA256+TLSv1",
 "RSA-PSK-CAMELLIA256-SHA384+TLSv1",
 "RSA-PSK-CHACHA20-POLY1305+TLSv1.2",
@@ -585,8 +585,8 @@ public class TestCipher {
 "AES128-CCM8+TLSv1.2",
 "AES256-CCM+TLSv1.2",
 "AES256-CCM8+TLSv1.2",
-"ARIA128-GCM-SHA256",
-"ARIA256-GCM-SHA384",
+"ARIA128-GCM-SHA256+TLSv1.2",
+"ARIA256-GCM-SHA384+TLSv1.2",
 "CAMELLIA128-SHA+SSLv3",
 "CAMELLIA256-SHA+S

svn commit: r1819055 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java

2017-12-22 Thread markt 
Author: markt
Date: Fri Dec 22 16:25:47 2017
New Revision: 1819055

URL: http://svn.apache.org/viewvc?rev=1819055&view=rev
Log:
Use correct format for names of unsupported ciphers

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 22 16:25:47 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1737903,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,1739492,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-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,176356

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

2017-12-22 Thread markt 
Author: markt
Date: Fri Dec 22 16:29:55 2017
New Revision: 1819057

URL: http://svn.apache.org/viewvc?rev=1819057&view=rev
Log:
Correct OpenSSL cipher names

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=1819057&r1=1819056&r2=1819057&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 
Fri Dec 22 16:29:55 2017
@@ -3818,7 +3818,7 @@ public enum Cipher {
 
 TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256(
 0xC05C,
-"ECDHE_ECDSA-ARIA128-GCM-SHA256",
+"ECDHE-ECDSA-ARIA128-GCM-SHA256",
 KeyExchange.ECDHe,
 Authentication.ECDSA,
 Encryption.ARIA128GCM,
@@ -3834,7 +3834,7 @@ public enum Cipher {
 ),
 TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384(
 0xC05D,
-"ECDHE_ECDSA-ARIA256-GCM-SHA384",
+"ECDHE-ECDSA-ARIA256-GCM-SHA384",
 KeyExchange.ECDHe,
 Authentication.ECDSA,
 Encryption.ARIA256GCM,



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

svn commit: r1819058 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java

2017-12-22 Thread markt 
Author: markt
Date: Fri Dec 22 16:30:12 2017
New Revision: 1819058

URL: http://svn.apache.org/viewvc?rev=1819058&view=rev
Log:
Correct OpenSSL cipher names

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 Dec 22 16:30:12 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1737903,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,1739492,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-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1

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

2017-12-22 Thread markt 
Author: markt
Date: Fri Dec 22 16:34:04 2017
New Revision: 1819061

URL: http://svn.apache.org/viewvc?rev=1819061&view=rev
Log:
Correct OpenSSL cipher names

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=1819061&r1=1819060&r2=1819061&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 
Fri Dec 22 16:34:04 2017
@@ -3855,7 +3855,7 @@ public enum Cipher {
 
 TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256(
 0xC060,
-"ECDHE-RSA-ARIA128-GCM-SHA256",
+"ECDHE-ARIA128-GCM-SHA256",
 KeyExchange.ECDHe,
 Authentication.RSA,
 Encryption.ARIA128GCM,
@@ -3871,7 +3871,7 @@ public enum Cipher {
 ),
 TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384(
 0xC061,
-"ECDHE-RSA-ARIA256-GCM-SHA384",
+"ECDHE-ARIA256-GCM-SHA384",
 KeyExchange.ECDHe,
 Authentication.RSA,
 Encryption.ARIA256GCM,



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

svn commit: r1819062 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java

2017-12-22 Thread markt 
Author: markt
Date: Fri Dec 22 16:34:24 2017
New Revision: 1819062

URL: http://svn.apache.org/viewvc?rev=1819062&view=rev
Log:
Correct OpenSSL cipher names

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 Dec 22 16:34:24 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1737903,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,1739492,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-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1

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

2017-12-22 Thread markt 
Author: markt
Date: Fri Dec 22 16:47:40 2017
New Revision: 1819063

URL: http://svn.apache.org/viewvc?rev=1819063&view=rev
Log:
Correct key exchange for some of the newly added ARIA ciphers

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=1819063&r1=1819062&r2=1819063&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 
Fri Dec 22 16:47:40 2017
@@ -3819,7 +3819,7 @@ public enum Cipher {
 TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256(
 0xC05C,
 "ECDHE-ECDSA-ARIA128-GCM-SHA256",
-KeyExchange.ECDHe,
+KeyExchange.EECDH,
 Authentication.ECDSA,
 Encryption.ARIA128GCM,
 MessageDigest.SHA256,
@@ -3835,7 +3835,7 @@ public enum Cipher {
 TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384(
 0xC05D,
 "ECDHE-ECDSA-ARIA256-GCM-SHA384",
-KeyExchange.ECDHe,
+KeyExchange.EECDH,
 Authentication.ECDSA,
 Encryption.ARIA256GCM,
 MessageDigest.SHA384,
@@ -3856,7 +3856,7 @@ public enum Cipher {
 TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256(
 0xC060,
 "ECDHE-ARIA128-GCM-SHA256",
-KeyExchange.ECDHe,
+KeyExchange.EECDH,
 Authentication.RSA,
 Encryption.ARIA128GCM,
 MessageDigest.SHA256,
@@ -3872,7 +3872,7 @@ public enum Cipher {
 TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384(
 0xC061,
 "ECDHE-ARIA256-GCM-SHA384",
-KeyExchange.ECDHe,
+KeyExchange.EECDH,
 Authentication.RSA,
 Encryption.ARIA256GCM,
 MessageDigest.SHA384,



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

svn commit: r1819064 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java

2017-12-22 Thread markt 
Author: markt
Date: Fri Dec 22 16:48:13 2017
New Revision: 1819064

URL: http://svn.apache.org/viewvc?rev=1819064&view=rev
Log:
Correct key exchange for some of the newly added ARIA ciphers

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 Dec 22 16:48:13 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1737903,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,1739492,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-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,

svn commit: r1819068 - in /tomcat/trunk: java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigur

2017-12-22 Thread markt 
Author: markt
Date: Fri Dec 22 17:00:21 2017
New Revision: 1819068

URL: http://svn.apache.org/viewvc?rev=1819068&view=rev
Log:
Remove ARIA ciphers from DEFAULT
Set up aliases for ARIA ciphers

Modified:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java

tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java?rev=1819068&r1=1819067&r2=1819068&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
 Fri Dec 22 17:00:21 2017
@@ -264,6 +264,18 @@ public class OpenSSLCipherConfigurationP
  */
 private static final String AESCCM8 = "AESCCM8";
 /**
+ * Cipher suites using either 128 bit ARIA.
+ */
+private static final String ARIA128 = "ARIA128";
+/**
+ * Cipher suites using either 256 bit ARIA.
+ */
+private static final String ARIA256 = "ARIA";
+/**
+ * Cipher suites using either 128 or 256 bit ARIA.
+ */
+private static final String ARIA = "ARIA";
+/**
  * Cipher suites using 128 bit CAMELLIA.
  */
 private static final String CAMELLIA128 = "CAMELLIA128";
@@ -488,6 +500,9 @@ public class OpenSSLCipherConfigurationP
 addListAlias(AES128, filterByEncryption(allCiphers, new 
HashSet<>(Arrays.asList(Encryption.AES128, Encryption.AES128CCM, 
Encryption.AES128CCM8, Encryption.AES128GCM;
 addListAlias(AES256, filterByEncryption(allCiphers, new 
HashSet<>(Arrays.asList(Encryption.AES256, Encryption.AES256CCM, 
Encryption.AES256CCM8, Encryption.AES256GCM;
 addListAlias(AES, filterByEncryption(allCiphers, new 
HashSet<>(Arrays.asList(Encryption.AES128, Encryption.AES128CCM, 
Encryption.AES128CCM8, Encryption.AES128GCM, Encryption.AES256, 
Encryption.AES256CCM, Encryption.AES256CCM8, Encryption.AES256GCM;
+addListAlias(ARIA128, filterByEncryption(allCiphers, 
Collections.singleton(Encryption.ARIA128GCM)));
+addListAlias(ARIA256, filterByEncryption(allCiphers, 
Collections.singleton(Encryption.ARIA256GCM)));
+addListAlias(ARIA, filterByEncryption(allCiphers, new 
HashSet<>(Arrays.asList(Encryption.ARIA128GCM, Encryption.ARIA256GCM;
 addListAlias(AESGCM, filterByEncryption(allCiphers, new 
HashSet<>(Arrays.asList(Encryption.AES128GCM, Encryption.AES256GCM;
 addListAlias(AESCCM, filterByEncryption(allCiphers, new 
HashSet<>(Arrays.asList(Encryption.AES128CCM, Encryption.AES128CCM8, 
Encryption.AES256CCM, Encryption.AES256CCM8;
 addListAlias(AESCCM8, filterByEncryption(allCiphers, new 
HashSet<>(Arrays.asList(Encryption.AES128CCM8, Encryption.AES256CCM8;
@@ -524,7 +539,7 @@ public class OpenSSLCipherConfigurationP
 addListAlias(SRP, filterByKeyExchange(allCiphers, 
Collections.singleton(KeyExchange.SRP)));
 initialized = true;
 // Despite what the OpenSSL docs say, DEFAULT also excludes SSLv2
-addListAlias(DEFAULT, 
parse("ALL:!EXPORT:!eNULL:!aNULL:!SSLv2:!DES:!RC2:!RC4:!DSS:!SEED:!IDEA:!CAMELLIA:!AESCCM:!3DES"));
+addListAlias(DEFAULT, 
parse("ALL:!EXPORT:!eNULL:!aNULL:!SSLv2:!DES:!RC2:!RC4:!DSS:!SEED:!IDEA:!CAMELLIA:!AESCCM:!3DES!ARIA"));
 // COMPLEMENTOFDEFAULT is also not exactly as defined by the docs
 LinkedHashSet complementOfDefault = filterByKeyExchange(all, 
new HashSet<>(Arrays.asList(KeyExchange.EDH,KeyExchange.EECDH)));
 complementOfDefault = filterByAuthentication(complementOfDefault, 
Collections.singleton(Authentication.aNULL));
@@ -540,6 +555,7 @@ public class OpenSSLCipherConfigurationP
 complementOfDefault.addAll(aliases.get(IDEA));
 complementOfDefault.addAll(aliases.get(CAMELLIA));
 complementOfDefault.addAll(aliases.get(AESCCM));
+complementOfDefault.addAll(aliases.get(ARIA));
 defaultSort(complementOfDefault);
 addListAlias(COMPLEMENTOFDEFAULT, complementOfDefault);
 }

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java?rev=1819068&r1=1819067&r2=1819068&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
 (original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpe

svn commit: r1819070 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java

2017-12-22 Thread markt 
Author: markt
Date: Fri Dec 22 17:08:38 2017
New Revision: 1819070

URL: http://svn.apache.org/viewvc?rev=1819070&view=rev
Log:
Fix copy/paste error

Modified:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java?rev=1819070&r1=1819069&r2=1819070&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
 Fri Dec 22 17:08:38 2017
@@ -270,7 +270,7 @@ public class OpenSSLCipherConfigurationP
 /**
  * Cipher suites using either 256 bit ARIA.
  */
-private static final String ARIA256 = "ARIA";
+private static final String ARIA256 = "ARIA256";
 /**
  * Cipher suites using either 128 or 256 bit ARIA.
  */



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

svn commit: r1819071 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java

2017-12-22 Thread markt 
Author: markt
Date: Fri Dec 22 17:11:32 2017
New Revision: 1819071

URL: http://svn.apache.org/viewvc?rev=1819071&view=rev
Log:
Fix typo (missing ':')

Modified:

tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java?rev=1819071&r1=1819070&r2=1819071&view=diff
==
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
 Fri Dec 22 17:11:32 2017
@@ -539,7 +539,7 @@ public class OpenSSLCipherConfigurationP
 addListAlias(SRP, filterByKeyExchange(allCiphers, 
Collections.singleton(KeyExchange.SRP)));
 initialized = true;
 // Despite what the OpenSSL docs say, DEFAULT also excludes SSLv2
-addListAlias(DEFAULT, 
parse("ALL:!EXPORT:!eNULL:!aNULL:!SSLv2:!DES:!RC2:!RC4:!DSS:!SEED:!IDEA:!CAMELLIA:!AESCCM:!3DES!ARIA"));
+addListAlias(DEFAULT, 
parse("ALL:!EXPORT:!eNULL:!aNULL:!SSLv2:!DES:!RC2:!RC4:!DSS:!SEED:!IDEA:!CAMELLIA:!AESCCM:!3DES:!ARIA"));
 // COMPLEMENTOFDEFAULT is also not exactly as defined by the docs
 LinkedHashSet complementOfDefault = filterByKeyExchange(all, 
new HashSet<>(Arrays.asList(KeyExchange.EDH,KeyExchange.EECDH)));
 complementOfDefault = filterByAuthentication(complementOfDefault, 
Collections.singleton(Authentication.aNULL));



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

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

2017-12-22 Thread markt 
Author: markt
Date: Fri Dec 22 17:37:35 2017
New Revision: 1819074

URL: http://svn.apache.org/viewvc?rev=1819074&view=rev
Log:
Correct message digest for newly added ARIA ciphers

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=1819074&r1=1819073&r2=1819074&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 
Fri Dec 22 17:37:35 2017
@@ -3716,7 +3716,7 @@ public enum Cipher {
 KeyExchange.RSA,
 Authentication.RSA,
 Encryption.ARIA128GCM,
-MessageDigest.SHA256,
+MessageDigest.AEAD,
 Protocol.TLSv1_2,
 false,
 EncryptionLevel.HIGH,
@@ -3732,7 +3732,7 @@ public enum Cipher {
 KeyExchange.RSA,
 Authentication.RSA,
 Encryption.ARIA256GCM,
-MessageDigest.SHA384,
+MessageDigest.AEAD,
 Protocol.TLSv1_2,
 false,
 EncryptionLevel.HIGH,
@@ -3748,7 +3748,7 @@ public enum Cipher {
 KeyExchange.EDH,
 Authentication.RSA,
 Encryption.ARIA128GCM,
-MessageDigest.SHA256,
+MessageDigest.AEAD,
 Protocol.TLSv1_2,
 false,
 EncryptionLevel.HIGH,
@@ -3764,7 +3764,7 @@ public enum Cipher {
 KeyExchange.EDH,
 Authentication.RSA,
 Encryption.ARIA256GCM,
-MessageDigest.SHA384,
+MessageDigest.AEAD,
 Protocol.TLSv1_2,
 false,
 EncryptionLevel.HIGH,
@@ -3785,7 +3785,7 @@ public enum Cipher {
 KeyExchange.EDH,
 Authentication.DSS,
 Encryption.ARIA128GCM,
-MessageDigest.SHA256,
+MessageDigest.AEAD,
 Protocol.TLSv1_2,
 false,
 EncryptionLevel.HIGH,
@@ -3801,7 +3801,7 @@ public enum Cipher {
 KeyExchange.EDH,
 Authentication.DSS,
 Encryption.ARIA256GCM,
-MessageDigest.SHA384,
+MessageDigest.AEAD,
 Protocol.TLSv1_2,
 false,
 EncryptionLevel.HIGH,
@@ -3822,7 +3822,7 @@ public enum Cipher {
 KeyExchange.EECDH,
 Authentication.ECDSA,
 Encryption.ARIA128GCM,
-MessageDigest.SHA256,
+MessageDigest.AEAD,
 Protocol.TLSv1_2,
 false,
 EncryptionLevel.HIGH,
@@ -3838,7 +3838,7 @@ public enum Cipher {
 KeyExchange.EECDH,
 Authentication.ECDSA,
 Encryption.ARIA256GCM,
-MessageDigest.SHA384,
+MessageDigest.AEAD,
 Protocol.TLSv1_2,
 false,
 EncryptionLevel.HIGH,
@@ -3859,7 +3859,7 @@ public enum Cipher {
 KeyExchange.EECDH,
 Authentication.RSA,
 Encryption.ARIA128GCM,
-MessageDigest.SHA256,
+MessageDigest.AEAD,
 Protocol.TLSv1_2,
 false,
 EncryptionLevel.HIGH,
@@ -3875,7 +3875,7 @@ public enum Cipher {
 KeyExchange.EECDH,
 Authentication.RSA,
 Encryption.ARIA256GCM,
-MessageDigest.SHA384,
+MessageDigest.AEAD,
 Protocol.TLSv1_2,
 false,
 EncryptionLevel.HIGH,
@@ -3896,7 +3896,7 @@ public enum Cipher {
 KeyExchange.PSK,
 Authentication.PSK,
 Encryption.ARIA128GCM,
-MessageDigest.SHA256,
+MessageDigest.AEAD,
 Protocol.TLSv1_2,
 false,
 EncryptionLevel.HIGH,
@@ -3912,7 +3912,7 @@ public enum Cipher {
 KeyExchange.PSK,
 Authentication.PSK,
 Encryption.ARIA256GCM,
-MessageDigest.SHA384,
+MessageDigest.AEAD,
 Protocol.TLSv1_2,
 false,
 EncryptionLevel.HIGH,
@@ -3928,7 +3928,7 @@ public enum Cipher {
 KeyExchange.DHEPSK,
 Authentication.PSK,
 Encryption.ARIA128GCM,
-MessageDigest.SHA256,
+MessageDigest.AEAD,
 Protocol.TLSv1_2,
 false,
 EncryptionLevel.HIGH,
@@ -3944,7 +3944,7 @@ public enum Cipher {
 KeyExchange.DHEPSK,
 Authentication.PSK,
 Encryption.ARIA256GCM,
-MessageDigest.SHA384,
+MessageDigest.AEAD,
 Protocol.TLSv1_2,
 false,
 EncryptionLevel.HIGH,
@@ -3960,7 +3960,7 @@ public enum Cipher {
 KeyEx

svn commit: r1819075 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/openssl/ciphers/ test/org/apache/tomcat/util/net/openssl/ciphers/

2017-12-22 Thread markt 
Author: markt
Date: Fri Dec 22 17:39:34 2017
New Revision: 1819075

URL: http://svn.apache.org/viewvc?rev=1819075&view=rev
Log:
Correct message digest for newly added ARIA ciphers
Remove ARIA ciphers from DEFAULT
Set up aliases for ARIA ciphers

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java

tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java

tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 22 17:39:34 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1737903,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,1739492,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-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,17625

svn commit: r1819077 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java

2017-12-22 Thread markt 
Author: markt
Date: Fri Dec 22 17:48:24 2017
New Revision: 1819077

URL: http://svn.apache.org/viewvc?rev=1819077&view=rev
Log:
ARIA ciphers were added in 1.1.0

Modified:

tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java?rev=1819077&r1=1819076&r2=1819077&view=diff
==
--- 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java 
Fri Dec 22 17:48:24 2017
@@ -230,6 +230,22 @@ public class TesterOpenSSL {
 
unimplemented.add(Cipher.TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256);
 
unimplemented.add(Cipher.TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256);
 
unimplemented.add(Cipher.TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256);
+unimplemented.add(Cipher.TLS_RSA_WITH_ARIA_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_RSA_WITH_ARIA_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_DHE_RSA_WITH_ARIA_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_DHE_RSA_WITH_ARIA_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_DHE_DSS_WITH_ARIA_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_DHE_DSS_WITH_ARIA_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_PSK_WITH_ARIA_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_PSK_WITH_ARIA_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_DHE_PSK_WITH_ARIA_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_DHE_PSK_WITH_ARIA_256_GCM_SHA384);
+unimplemented.add(Cipher.TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256);
+unimplemented.add(Cipher.TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384);
 } else {
 // These were removed in 1.1.0 so won't be available from that
 // version onwards.



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

svn commit: r1819078 - in /tomcat/tc8.5.x/trunk: ./ test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java

2017-12-22 Thread markt 
Author: markt
Date: Fri Dec 22 17:49:12 2017
New Revision: 1819078

URL: http://svn.apache.org/viewvc?rev=1819078&view=rev
Log:
ARIA ciphers were added in 1.1.0

Modified:
tomcat/tc8.5.x/trunk/   (props changed)

tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 22 17:49:12 2017
@@ -1,2 +1,2 @@
 /tomcat/tc8.0.x/trunk:1809644
-/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,1737903,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,1739492,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-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747
 
404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1
 
756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
 
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,176357

buildbot failure in on tomcat-trunk

2017-12-22 Thread buildbot 
The Buildbot has detected a new failure on builder tomcat-trunk while building 
. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/2924

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1819074
Blamelist: markt

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

buildbot success in on tomcat-trunk

2017-12-22 Thread buildbot 
The Buildbot has detected a restored build on builder tomcat-trunk while 
building . Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/2925

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1819077
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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