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 415c5c3bb8b3909cca0a7f548950167c637aaf63..d1388d9b430931ce5b527487672e33ee2f904a12 100644 (file)
--- 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,
   "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
 );
 
 # 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 d75e2741209084e1ba4b5792233afabe75d9a840..8d3917e12ec3e846fdb2265cc701f87197de1efe 100644 (file)
--- 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");