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

[markt]

Author: markt
Date: Mon Nov  7 22:04:52 2016
New Revision: 1768596

URL: http://svn.apache.org/viewvc?rev=1768596&view=rev
Log:
Fix failing Gump tests by ignoring dummy TLSv1.3 cipher added in OpenSSL master

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=1768596&r1=1768595&r2=1768596&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 
Mon Nov  7 22:04:52 2016
@@ -34,7 +34,8 @@ public class TestCipher {
      */
     @Test
     public void testAllOpenSSLCiphersMapped() throws Exception {
-        Set<String> openSSLCipherSuites = 
TesterOpenSSL.getOpenSSLCiphersAsSet("ALL:eNULL");
+        Set<String> openSSLCipherSuites =
+                
TesterOpenSSL.getOpenSSLCiphersAsSet("ALL:eNULL:!TLS13-AES-128-GCM-SHA256");
 
         StringBuilder errors = new StringBuilder();
 
@@ -76,7 +77,8 @@ 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.
-        Set<String> availableCipherSuites = 
TesterOpenSSL.getOpenSSLCiphersAsSet("ALL:eNULL:aRSA");
+        Set<String> availableCipherSuites =
+                
TesterOpenSSL.getOpenSSLCiphersAsSet("ALL:eNULL:aRSA:!TLS13-AES-128-GCM-SHA256");
         Set<String> expectedCipherSuites = new HashSet<>();
         for (Cipher cipher : Cipher.values()) {
             if (TesterOpenSSL.OPENSSL_UNIMPLEMENTED_CIPHERS.contains(cipher)) {



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