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

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

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

Mark Thomas-2
Author: markt
Date: Fri Mar 16 13:17:17 2018
New Revision: 1826985

URL: http://svn.apache.org/viewvc?rev=1826985&view=rev
Log:
Clean-up

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=1826985&r1=1826984&r2=1826985&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 Mar 16 13:17:17 2018
@@ -77,7 +77,6 @@ public class TestCipher {
         // OpenSSL does not include ECDH/ECDHE ciphers in all and there is no
         //         EC alias. Use aRSA.
         // OpenSSL 1.0.0 onwards does not include eNULL in all.
-        // TLS 1.3 is still i
         Set<String> availableCipherSuites =
                 TesterOpenSSL.getOpenSSLCiphersAsSet("ALL:eNULL:aRSA");
 
@@ -1109,5 +1108,12 @@ public class TestCipher {
                     "TLS_PSK_WITH_CHACHA20_POLY1305_SHA256",
                     "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256",
                     "TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256",
-                    "TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256")));
+                    "TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256",
+                    // TLV 1.3 draft 26 - subject to change
+                    "TLS_AES_128_CCM_SHA256",
+                    "TLS_AES_128_CCM_8_SHA256",
+                    "TLS_AES_128_GCM_SHA256",
+                    "TLS_AES_256_GCM_SHA384",
+                    "TLS_CHACHA20_POLY1305_SHA256"
+                    )));
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]