Commit df0aa777 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix building with no-cms 



The new fuzzing code broke no-cms

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 642a166c

fuzz/build.info

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

test/recipes/05-test_fuzz.t

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