VMF 5.1.0 Release

Author: kdharsee-draper

.dockerignore

@@ -45,4 +45,12 @@ _deps
 
 # Helper scripts
 *.sh
-*.ps1
+*.ps1
+
+# SUTs for UTs
+test/haystackSUT/haystack
+test/haystackSUT/haystack_AFL_shmem
+test/magicBytesSUT/magicbytes
+test/magicBytesSUT/magicbytes_cmplog
+test/unittest/inputs/AFLForkserverExecutorTest/mimeSUT/mime
+test/unittest/inputs/AFLForkserverExecutorTest/mimeSUT/mime_asan

.gitignore

@@ -48,8 +48,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 # produce compile_commands.json for clangd support
 set(CMAKE_EXPORT_COMPILE_COMMANDS True)
 #############################################################
-project(VMF VERSION 5.0.0
-    LANGUAGES CXX )
+project(VMF VERSION 5.1.0
+    LANGUAGES CXX C )
 #############################################################
 
 # Export all symbols for windows
@@ -88,11 +88,6 @@ install(DIRECTORY vmf/src/scripts/bin/
   DESTINATION ${VMF_INSTALL_BINDIR}
   USE_SOURCE_PERMISSIONS)
 
-#Header files are needed for plog library
-install(DIRECTORY vmf/dependencies/plog/include/plog
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/
-)
-
 install(DIRECTORY vmf/src/samples
   DESTINATION ${CMAKE_INSTALL_PREFIX}
   PATTERN "build" EXCLUDE)
@@ -101,14 +96,7 @@ install(DIRECTORY vmf/src/samples
 INSTALL(DIRECTORY test DESTINATION 
   DESTINATION ${CMAKE_INSTALL_PREFIX}
   PATTERN "*.cpp" EXCLUDE
-  PATTERN "*.txt" EXCLUDE
-  PATTERN "haystack" EXCLUDE
-  PATTERN "haystack_AFL_persist" EXCLUDE
-  PATTERN "haystack_AFL_deferred" EXCLUDE
-  PATTERN "haystack_AFL_shmem" EXCLUDE
-  PATTERN "magicbytes" EXCLUDE
-  PATTERN "magicbytes_cmplog" EXCLUDE    
-  PATTERN "setup_jerryscript" EXCLUDE
+  PATTERN "*.txt" EXCLUDE    
   PATTERN "test_only" EXCLUDE
   PATTERN "test_only/*" EXCLUDE
   PATTERN "unittest" EXCLUDE
@@ -118,37 +106,3 @@ INSTALL(DIRECTORY test DESTINATION
 INSTALL(DIRECTORY data DESTINATION 
   DESTINATION ${CMAKE_INSTALL_PREFIX}
 )
-
-#install haystack example executable
-file (COPY test/haystackSUT/haystack
-DESTINATION ${CMAKE_INSTALL_PREFIX}/test/haystackSUT
-USE_SOURCE_PERMISSIONS)
-
-#install haystack_AFL_persist example executable
-file (COPY test/haystackSUT/haystack_AFL_persist
-DESTINATION ${CMAKE_INSTALL_PREFIX}/test/haystackSUT
-USE_SOURCE_PERMISSIONS)
-
-#install haystack_AFL_deferred example executable
-file (COPY test/haystackSUT/haystack_AFL_deferred
-DESTINATION ${CMAKE_INSTALL_PREFIX}/test/haystackSUT
-USE_SOURCE_PERMISSIONS)
-
-#install haystack_AFL_shmem example executable
-file (COPY test/haystackSUT/haystack_AFL_shmem
-DESTINATION ${CMAKE_INSTALL_PREFIX}/test/haystackSUT
-USE_SOURCE_PERMISSIONS)
-
-#file (COPY test/haystackSUT/haystack_libfuzzer
-#DESTINATION ${CMAKE_INSTALL_PREFIX}/test/haystackSUT
-#USE_SOURCE_PERMISSIONS)
-
-#install magicbytes executable
-file (COPY test/magicBytesSUT/magicbytes
-DESTINATION ${CMAKE_INSTALL_PREFIX}/test/magicBytesSUT
-USE_SOURCE_PERMISSIONS)
-
-#install magicbytes_cmplog executable
-file (COPY test/magicBytesSUT/magicbytes_cmplog
-DESTINATION ${CMAKE_INSTALL_PREFIX}/test/magicBytesSUT/
-USE_SOURCE_PERMISSIONS)

CMakeLists.txt

@@ -18,9 +18,9 @@ As of now, VMF can be run in Docker and on the following distributions of Linux:
 
 - CentOS 8 and 9
 - Kali
-- Oracle Linux 8 & 9
-- RedHat 8 & 9
-- Ubuntu 20.04, and 22.04
+- Oracle Linux 8 and 9
+- RedHat 8 and 9
+- Ubuntu 20.04, 22.04 and 24.04
 
 VMF depends on several open source projects, but uses a "batteries-included" philosophy to dependencies where practical.
 
@@ -64,6 +64,12 @@ is often installed by default. You can install this on Debian-based systems (inc
 ```bash
 sudo apt install libcurl-dev
 ```
+
+Note: You _may_ need to install a libcurl development package built specifically for your host's secure socket layer library via, e.g.,
+```bash
+sudo apt install libcurl4-openssl-dev
+```
+
 On CentOS, RHEL, or Fedora, try
 ```bash
 sudo yum install libcurl-devel

README.md

@@ -12,7 +12,8 @@ RUN test -f /usr/share/doc/kitware-archive-keyring/copyright || wget -O - https:
     git \
     gnupg \
     lsb-core \
-    lsb-release
+    lsb-release \
+    cmake=3.28.3-0kitware1ubuntu22.04.1
 
 RUN lsb_release -a | grep -q "18.04" && ( \
       echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main" >> /etc/apt/sources.list && \
@@ -33,7 +34,6 @@ RUN apt-get update \
        python3-pip \
        python3-setuptools \
        build-essential \
-       cmake \
        lld-14 
 
 
@@ -60,7 +60,7 @@ RUN set -ex \
     && mkdir -p build \
     && cd build \
     && cmake -DCMAKE_INSTALL_PREFIX=/usr/local .. \
-    && make -j \
+    && make -j 8 \
     && make install \
     && set +ex
 

dockerfiles/Dockerfile.klee

@@ -29,8 +29,13 @@ RUN  apt-get update \
        python3-dev \
        python3-pip \
        python3-setuptools \
-       build-essential \
-       cmake
+       build-essential 
+
+RUN apt-get install -y apt-transport-https && \
+    curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor -o /usr/share/keyrings/kitware-archive-keyring.gpg && \
+    echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/  focal main" > /etc/apt/sources.list.d/kitware.list && \
+    apt-get update && \
+    apt install -y --no-install-recommends cmake=3.18.3-0kitware1ubuntu20.04.1 cmake-data=3.18.3-0kitware1ubuntu20.04.1
 
 ENV  LLVM_CONFIG=llvm-config-12
 RUN set -ex \
@@ -60,6 +65,6 @@ RUN set -ex \
     && mkdir -p build \
     && cd build \
     && cmake -DCMAKE_INSTALL_PREFIX=/usr/local .. \
-    && make -j \
+    && make -j 8 \
     && make install \
     && set +ex

dockerfiles/Dockerfile.u20

@@ -0,0 +1,58 @@
+FROM ubuntu:24.04 AS deps
+
+RUN  apt-get update \
+  && DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends --fix-missing \
+  ca-certificates \
+  curl \
+  gdb \
+  git \
+  gnupg \
+  lsb-release \
+  zip
+
+RUN  apt-get update \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --fix-missing \
+  graphviz \
+  clang-19 \
+  clang \
+  libclang-rt-19-dev \
+  doxygen \
+  libcurl4-openssl-dev \
+  llvm-19 \
+  llvm-19-dev \
+  lld-19 \
+  llvm \
+  lld \
+  python3-dev \
+  python3-pip \
+  python3-setuptools \
+  build-essential \
+  cmake
+
+ENV  LLVM_CONFIG=llvm-config-19
+
+FROM deps AS aflpp
+
+# Clone and build AFL++
+RUN set -ex \
+  && cd /usr/local/src \
+  && git clone --depth 1 -b v4.30c https://github.com/AFLplusplus/AFLplusplus.git \
+  && cd AFLplusplus \
+  && make all \
+  && make install \
+  && set +ex
+
+FROM aflpp AS vmf
+
+# Clone, build, install VMF
+RUN set -ex \
+  && cd /usr/local/src \
+  && mkdir vmf \
+  && git clone --depth 1 https://github.com/draperlaboratory/vadermodularfuzzer.git vmf \
+  && cd vmf \
+  && mkdir -p build \
+  && cd build \
+  && cmake -DCMAKE_INSTALL_PREFIX=/usr/local .. \
+  && make -j \
+  && make install \
+  && set +ex