diff options
author | Matt Caswell <matt@openssl.org> | 2017-12-10 11:41:30 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2017-12-11 09:41:59 +0000 |
commit | a8ea8018fa187e22fb4989450b550589e20f62c2 (patch) | |
tree | 8652ce21b897ddd5e26b3b0c47179ed3976d3134 /test | |
parent | ef178b4eabe7183c5c85a961f4855c277ee7e220 (diff) | |
download | openssl-a8ea8018fa187e22fb4989450b550589e20f62c2.tar.gz |
Fix no-chacha
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4891)
Diffstat (limited to 'test')
-rw-r--r-- | test/recipes/80-test_ssl_new.t | 2 | ||||
-rw-r--r-- | test/ssl-tests/25-cipher.conf.in | 2 |
2 files changed, 2 insertions, 2 deletions
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"); |