[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  65cc6d5c0acb8a0a925d9dbeb21ab96a6c7ec89f (commit)
      from  501d53c60091fdc8ed6ab1aa5ad96a71425d8dfd (commit)


- Log -----------------------------------------------------------------
commit 65cc6d5c0acb8a0a925d9dbeb21ab96a6c7ec89f
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Jun 5 10:59:31 2016 +0200

    Configure: complete the changed fuzz option checks
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 Configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Configure b/Configure
index 645548d..7bbb5b7 100755
--- a/Configure
+++ b/Configure
@@ -1071,7 +1071,8 @@ unless ($disabled{ubsan}) {
     $config{cflags} .= "-fsanitize=undefined -fno-sanitize-recover=all ";
 }
 
-unless ($disabled{fuzz} && $disabled{asan} && $disabled{ubsan}) {
+unless ($disabled{"fuzz-libfuzzer"} && $disabled{"fuzz-afl"}
+        && $disabled{asan} && $disabled{ubsan}) {
     $config{cflags} .= "-fno-omit-frame-pointer -g ";
 }
 #