[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  255af26c5d8039ee009a0ee718fbdc4023d045ec (commit)
      from  c2e888b54c3b25e89732f6ba66e489ef1ee5ef59 (commit)


- Log -----------------------------------------------------------------
commit 255af26c5d8039ee009a0ee718fbdc4023d045ec
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Aug 1 21:46:08 2016 +0100

    Some minor tweaks to the fuzzing docs
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 INSTALL        | 10 +++++-----
 fuzz/README.md |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/INSTALL b/INSTALL
index 85a74b8..0e868b7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -267,11 +267,11 @@
                    Don't compile in filename and line number information (e.g.
                    for errors and memory allocation).
 
-  enable-fuzz
-                   Build with support for fuzzing. This is a developer option
-                   only. It may not work on all platforms and should never be
-                   used in production environments. See the file fuzz/README.md
-                   for further details.
+  enable-fuzz-libfuzzer, enable-fuzz-afl
+                   Build with support for fuzzing using either libfuzzer or AFL.
+                   These are developer options only. They may not work on all
+                   platforms and should never be used in production environments.
+                   See the file fuzz/README.md for further details.
 
   no-gost
                    Don't build support for GOST based ciphersuites. Note that
diff --git a/fuzz/README.md b/fuzz/README.md
index e8596a7..138af0d 100644
--- a/fuzz/README.md
+++ b/fuzz/README.md
@@ -38,7 +38,7 @@ Configure for fuzzing:
     $ CC=clang ./config enable-fuzz-libfuzzer \
             --with-fuzzer-include=../../svn-work/Fuzzer \
             --with-fuzzer-lib=../../svn-work/Fuzzer/libFuzzer \
-            enable-asan enable-ubsan no-shared
+            -DPEDANTIC enable-asan enable-ubsan no-shared
     $ sudo apt-get install make
     $ LDCMD=clang++ make -j
     $ fuzz/helper.py $FUZZER