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+SSLv3",
"CAMELLIA128-SHA256+TLSv1.2",
@@ -619,8 +619,8 @@ public class TestCipher {
"DH-RSA-DES-CBC-SHA+SSLv3",
"DH-RSA-DES-CBC3-SHA+SSLv3",
"DH-RSA-SEED-SHA+SSLv3",
- "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-DSS-CAMELLIA128-SHA+SSLv3",
"DHE-DSS-CAMELLIA128-SHA256+TLSv1.2",
"DHE-DSS-CAMELLIA256-SHA+SSLv3",
@@ -637,8 +637,8 @@ public class TestCipher {
"DHE-PSK-AES256-CCM+TLSv1.2",
"DHE-PSK-AES256-CCM8+TLSv1.2",
"DHE-PSK-AES256-GCM-SHA384+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",
@@ -650,8 +650,8 @@ 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",
+ "DHE-RSA-ARIA128-GCM-SHA256+TLSv1.2",
+ "DHE-RSA-ARIA256-GCM-SHA384+TLSv1.2",
"DHE-RSA-CAMELLIA128-SHA+SSLv3",
"DHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"DHE-RSA-CAMELLIA256-SHA+SSLv3",
@@ -662,14 +662,14 @@ public class TestCipher {
"ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDH-RSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDH-RSA-CAMELLIA256-SHA384+TLSv1.2",
- "ECDHE-ARIA128-GCM-SHA256",
- "ECDHE-ARIA256-GCM-SHA384",
+ "ECDHE-ARIA128-GCM-SHA256+TLSv1.2",
+ "ECDHE-ARIA256-GCM-SHA384+TLSv1.2",
"ECDHE-ECDSA-AES128-CCM+TLSv1.2",
"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",
@@ -705,8 +705,8 @@ public class TestCipher {
"PSK-AES256-CCM+TLSv1.2",
"PSK-AES256-CCM8+TLSv1.2",
"PSK-AES256-GCM-SHA384+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",
@@ -723,8 +723,8 @@ public class TestCipher {
"RSA-PSK-AES256-CBC-SHA+SSLv3",
"RSA-PSK-AES256-CBC-SHA384+TLSv1",
"RSA-PSK-AES256-GCM-SHA384+TLSv1.2",
- "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",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
