[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  df0aa7770e09677b746843f2ba33e2897f615d93 (commit)
      from  642a166ce1d33048f19b0262e864fedce34960ac (commit)


- Log -----------------------------------------------------------------
commit df0aa7770e09677b746843f2ba33e2897f615d93
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Jul 18 20:59:30 2016 +0100

    Fix building with no-cms
    
    The new fuzzing code broke no-cms
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 fuzz/build.info             | 12 ++++++++++--
 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 9d90bc7..addb12b 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 ec5c5ad..c992e19 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) {