From dev-return-193701-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org Wed Oct 3 10:57:03 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 7BF6718065B for ; Wed, 3 Oct 2018 10:57:02 +0200 (CEST) Received: (qmail 92958 invoked by uid 500); 3 Oct 2018 08:56:56 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 92948 invoked by uid 99); 3 Oct 2018 08:56:56 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Oct 2018 08:56:56 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 6A1B63A0047 for ; Wed, 3 Oct 2018 08:56:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1842691 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java Date: Wed, 03 Oct 2018 08:56:54 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20181003085655.6A1B63A0047@svn01-us-west.apache.org> 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 renamed = new HashMap<>(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org