Fix no-chacha
authorMatt Caswell <matt@openssl.org>
Sun, 10 Dec 2017 11:41:30 +0000 (11:41 +0000)
committerMatt Caswell <matt@openssl.org>
Mon, 11 Dec 2017 09:41:59 +0000 (09:41 +0000)
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4891)

test/recipes/80-test_ssl_new.t
test/ssl-tests/25-cipher.conf.in

index 415c5c3..d1388d9 100644 (file)
@@ -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
index d75e274..8d3917e 100644 (file)
@@ -153,4 +153,4 @@ my @tests_poly1305 = (
     },
 );
 
-push @tests, @tests_poly1305 unless disabled("poly1305");
+push @tests, @tests_poly1305 unless disabled("poly1305") || disabled("chacha");