4
0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-05 22:19:40 +00:00

Fix no-ct

Ensure that we don't build/run the ct fuzzing code if no-ct is used.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Matt Caswell 2016-07-22 15:49:03 +01:00
parent c1054bb4d2
commit 49dadc1cb7
2 changed files with 14 additions and 3 deletions
fuzz
test/recipes

@ -9,12 +9,16 @@
-}
IF[{- !$disabled{"fuzz-afl"} || !$disabled{"fuzz-libfuzzer"} -}]
PROGRAMS_NO_INST=asn1 asn1parse bignum bndiv conf crl ct server x509
PROGRAMS_NO_INST=asn1 asn1parse bignum bndiv conf crl server x509
IF[{- !$disabled{"cms"} -}]
PROGRAMS_NO_INST=cms
ENDIF
IF[{- !$disabled{"ct"} -}]
PROGRAMS_NO_INST=ct
ENDIF
SOURCE[asn1]=asn1.c driver.c
INCLUDE[asn1]=../include {- $ex_inc -}
DEPEND[asn1]=../libcrypto {- $ex_lib -}
@ -57,12 +61,16 @@ IF[{- !$disabled{"fuzz-afl"} || !$disabled{"fuzz-libfuzzer"} -}]
ENDIF
IF[{- !$disabled{tests} -}]
PROGRAMS_NO_INST=asn1-test asn1parse-test bignum-test bndiv-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 server-test x509-test
IF[{- !$disabled{"cms"} -}]
PROGRAMS_NO_INST=cms-test
ENDIF
IF[{- !$disabled{"ct"} -}]
PROGRAMS_NO_INST=ct-test
ENDIF
SOURCE[asn1-test]=asn1.c test-corpus.c
INCLUDE[asn1-test]=../include
DEPEND[asn1-test]=../libcrypto

@ -15,10 +15,13 @@ use OpenSSL::Test::Utils;
setup("test_fuzz");
my @fuzzers = ('asn1', 'asn1parse', 'bignum', 'bndiv', 'conf', 'crl', 'ct', 'server', 'x509');
my @fuzzers = ('asn1', 'asn1parse', 'bignum', 'bndiv', 'conf', 'crl', 'server', 'x509');
if (!disabled("cms")) {
push @fuzzers, 'cms';
}
if (!disabled("ct")) {
push @fuzzers, 'ct';
}
plan tests => scalar @fuzzers;
foreach my $f (@fuzzers) {