From: Matt Caswell <matt@openssl.org>
Date: Fri, 22 Jul 2016 14:49:03 +0000 (+0100)
Subject: Fix no-ct
X-Git-Tag: OpenSSL_1_1_0-pre6~110
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=49dadc1cb74dd1c83983900b5c4acb22c647af31;ds=sidebyside

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>
---

diff --git a/fuzz/build.info b/fuzz/build.info
index addb12bdc4..eade218937 100644
--- a/fuzz/build.info
+++ b/fuzz/build.info
@@ -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
diff --git a/test/recipes/05-test_fuzz.t b/test/recipes/05-test_fuzz.t
index c992e19574..d152925733 100755
--- a/test/recipes/05-test_fuzz.t
+++ b/test/recipes/05-test_fuzz.t
@@ -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) {