Commit 49dadc1c authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix no-ct 



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

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent c1054bb4

fuzz/build.info

+10 −2
Original line number Diff line number Diff line
@@ -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

test/recipes/05-test_fuzz.t

+4 −1
Original line number Diff line number Diff line
@@ -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) {