Author: markt Date: Wed Oct 3 08:56:54 2018 New Revision: 1842691 URL: http://svn.apache.org/viewvc?rev=1842691&view=rev Log: Fix failing tests when testing against OpenSSL 1.1.0. The ARIA ciphers were introduced in 1.1.1, not 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=1842691&r1=1842690&r2=1842691&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 Wed Oct 3 08:56:54 2018 @@ -213,22 +213,6 @@ 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. @@ -302,6 +286,27 @@ public class TesterOpenSSL { unimplemented.add(Cipher.TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA); } + if (VERSION < 10101) { + // These were implemented in 1.1.1 so won't be available in any + // earlier version + 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); + } + OPENSSL_UNIMPLEMENTED_CIPHERS = Collections.unmodifiableSet(unimplemented); Map<String,String> renamed = new HashMap<>(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org