diff options
| author | Matt Caswell <matt@openssl.org> | 2016-07-18 20:59:30 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-07-19 14:01:33 +0100 |
| commit | df0aa7770e09677b746843f2ba33e2897f615d93 (patch) | |
| tree | 6ac6494b07e0378d0655cae3255c55b6f9cf2a6b | |
| parent | 642a166ce1d33048f19b0262e864fedce34960ac (diff) | |
Fix building with no-cms
The new fuzzing code broke no-cms
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | fuzz/build.info | 12 | ||||
| -rwxr-xr-x | test/recipes/05-test_fuzz.t | 6 |
2 files changed, 15 insertions, 3 deletions
diff --git a/fuzz/build.info b/fuzz/build.info index 9d90bc74ce..addb12bdc4 100644 --- a/fuzz/build.info +++ b/fuzz/build.info @@ -9,7 +9,11 @@ -} IF[{- !$disabled{"fuzz-afl"} || !$disabled{"fuzz-libfuzzer"} -}] - PROGRAMS_NO_INST=asn1 asn1parse bignum bndiv cms conf crl ct server x509 + PROGRAMS_NO_INST=asn1 asn1parse bignum bndiv conf crl ct server x509 + + IF[{- !$disabled{"cms"} -}] + PROGRAMS_NO_INST=cms + ENDIF SOURCE[asn1]=asn1.c driver.c INCLUDE[asn1]=../include {- $ex_inc -} @@ -53,7 +57,11 @@ IF[{- !$disabled{"fuzz-afl"} || !$disabled{"fuzz-libfuzzer"} -}] ENDIF IF[{- !$disabled{tests} -}] - PROGRAMS_NO_INST=asn1-test asn1parse-test bignum-test bndiv-test cms-test conf-test crl-test ct-test server-test x509-test + PROGRAMS_NO_INST=asn1-test asn1parse-test bignum-test bndiv-test conf-test crl-test ct-test server-test x509-test + + IF[{- !$disabled{"cms"} -}] + PROGRAMS_NO_INST=cms-test + ENDIF SOURCE[asn1-test]=asn1.c test-corpus.c INCLUDE[asn1-test]=../include diff --git a/test/recipes/05-test_fuzz.t b/test/recipes/05-test_fuzz.t index ec5c5ad4ed..c992e19574 100755 --- a/test/recipes/05-test_fuzz.t +++ b/test/recipes/05-test_fuzz.t @@ -11,10 +11,14 @@ use warnings; use if $^O ne "VMS", 'File::Glob' => qw/glob/; use OpenSSL::Test qw/:DEFAULT srctop_file/; +use OpenSSL::Test::Utils; setup("test_fuzz"); -my @fuzzers = ('asn1', 'asn1parse', 'bignum', 'bndiv', 'cms', 'conf', 'crl', 'ct', 'server', 'x509'); +my @fuzzers = ('asn1', 'asn1parse', 'bignum', 'bndiv', 'conf', 'crl', 'ct', 'server', 'x509'); +if (!disabled("cms")) { + push @fuzzers, 'cms'; +} plan tests => scalar @fuzzers; foreach my $f (@fuzzers) { |