[tomcat8] 06/09: Disabled the tests checking the ARIA cipher since it isn't enabled by default in OpenSSL

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit 0010667d6d8e23738dc9116f97dc125e552db494
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Feb 16 13:27:01 2018 +0100

    Disabled the tests checking the ARIA cipher since it isn't enabled by default in OpenSSL
---
 debian/changelog                                      |  4 +++-
 .../patches/0021-dont-test-unsupported-ciphers.patch  | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7cd0b1d..2866f91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-tomcat8 (8.5.27-1) UNRELEASED; urgency=medium
+tomcat8 (8.5.28-1) UNRELEASED; urgency=medium
 
   * New upstream release
     - Refreshed the patches
+    - Disabled the tests checking the ARIA cipher since it isn't enabled
+      by default in OpenSSL
   * Standards-Version updated to 4.1.3
   * Switch to debhelper level 11
 
diff --git a/debian/patches/0021-dont-test-unsupported-ciphers.patch b/debian/patches/0021-dont-test-unsupported-ciphers.patch
index f2fd8a0..92b29b5 100644
--- a/debian/patches/0021-dont-test-unsupported-ciphers.patch
+++ b/debian/patches/0021-dont-test-unsupported-ciphers.patch
@@ -1,13 +1,30 @@
 Description: Don't check the IDEA cipher during the tests since it is disabled in Debian (see #327739)
+ Also ignore ARIA which is disabled by default in OpenSSL.
 Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
 +++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
-@@ -104,6 +104,7 @@
+@@ -104,6 +104,23 @@
          unimplemented.add(Cipher.SSL2_RC4_128_EXPORT40_WITH_MD5);
          unimplemented.add(Cipher.SSL2_IDEA_128_CBC_WITH_MD5);
          unimplemented.add(Cipher.SSL2_DES_192_EDE3_CBC_WITH_MD5);
 +        unimplemented.add(Cipher.TLS_RSA_WITH_IDEA_CBC_SHA);
++        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_DHE_PSK_WITH_ARIA_128_GCM_SHA256);
++        unimplemented.add(Cipher.TLS_DHE_PSK_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_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_RSA_PSK_WITH_ARIA_128_GCM_SHA256);
++        unimplemented.add(Cipher.TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384);
++        unimplemented.add(Cipher.TLS_RSA_WITH_ARIA_128_GCM_SHA256);
++        unimplemented.add(Cipher.TLS_RSA_WITH_ARIA_256_GCM_SHA384);
  
          if (VERSION < 10002) {
              // These were implemented in 1.0.2 so won't be available in any

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git