From: Matt Caswell <matt@openssl.org>
Date: Sun, 10 Dec 2017 11:41:30 +0000 (+0000)
Subject: Fix no-chacha
X-Git-Tag: OpenSSL_1_1_1-pre1~319
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8ea8018fa187e22fb4989450b550589e20f62c2;p=openssl

Fix no-chacha

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4891)
---

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 415c5c3bb8..d1388d9b43 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -66,7 +66,7 @@ my %conf_dependent_tests = (
   "19-mac-then-encrypt.conf" => !$is_default_tls,
   "20-cert-select.conf" => !$is_default_tls || $no_dh || $no_dsa,
   "22-compression.conf" => !$is_default_tls,
-  "25-cipher.conf" => disabled("poly1305"),
+  "25-cipher.conf" => disabled("poly1305") || disabled("chacha"),
 );
 
 # Add your test here if it should be skipped for some compile-time
diff --git a/test/ssl-tests/25-cipher.conf.in b/test/ssl-tests/25-cipher.conf.in
index d75e274120..8d3917e12e 100644
--- a/test/ssl-tests/25-cipher.conf.in
+++ b/test/ssl-tests/25-cipher.conf.in
@@ -153,4 +153,4 @@ my @tests_poly1305 = (
     },
 );
 
-push @tests, @tests_poly1305 unless disabled("poly1305");
+push @tests, @tests_poly1305 unless disabled("poly1305") || disabled("chacha");