From e9be58b69c58f2561bd777c7e7961f87295d1652 Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Sun, 23 Jan 2022 19:28:38 +0100 Subject: add citation --- CITATION.cff | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 CITATION.cff diff --git a/CITATION.cff b/CITATION.cff new file mode 100644 index 00000000..7f00388f --- /dev/null +++ b/CITATION.cff @@ -0,0 +1,33 @@ +cff-version: 1.2.0 +message: "If you use this software, please cite it as below." +authors: + - given-names: Fioraldi + family-names: Andrea + email: andreafioraldi@gmail.com + - given-names: Maier + family-names: Dominik + email: mail@dmnk.co + - given-names: Eißfeldt + family-names: Heiko + email: heiko.eissfeldt@hexco.de + - given-names: Heuse + family-names: Marc + name-particle: van Hauser + email: vh@thc.org + affiliation: The Hacker's Choice +title: "AFL++" +version: 3.14 +type: software +date-released: 2021-07-19 +url: "https://github.com/AFLplusplus/AFLplusplus" +keywords: + - fuzzing + - fuzzer + - fuzz-testing + - instrumentation + - afl-fuzz + - qemu + - llvm + - unicorn-emulator + - securiy +license: AGPL-3.0-or-later -- cgit 1.4.1 From 319c7457ffd77112406fdb3b705722e392d91458 Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Sun, 23 Jan 2022 19:31:04 +0100 Subject: fix citation --- CITATION.cff | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 7f00388f..cdc8a46e 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,20 +1,19 @@ cff-version: 1.2.0 message: "If you use this software, please cite it as below." authors: + - given-names: Heuse + family-names: Marc + name-particle: van Hauser + email: mh@mh-sec.de + - given-names: Eißfeldt + family-names: Heiko + email: heiko.eissfeldt@hexco.de - given-names: Fioraldi family-names: Andrea email: andreafioraldi@gmail.com - given-names: Maier family-names: Dominik email: mail@dmnk.co - - given-names: Eißfeldt - family-names: Heiko - email: heiko.eissfeldt@hexco.de - - given-names: Heuse - family-names: Marc - name-particle: van Hauser - email: vh@thc.org - affiliation: The Hacker's Choice title: "AFL++" version: 3.14 type: software -- cgit 1.4.1 From 86983f406010a752f72aca1ac7e62dbdd47080b2 Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Sun, 23 Jan 2022 19:31:33 +0100 Subject: fix citation --- CITATION.cff | 1 - 1 file changed, 1 deletion(-) diff --git a/CITATION.cff b/CITATION.cff index cdc8a46e..94841ec0 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -3,7 +3,6 @@ message: "If you use this software, please cite it as below." authors: - given-names: Heuse family-names: Marc - name-particle: van Hauser email: mh@mh-sec.de - given-names: Eißfeldt family-names: Heiko -- cgit 1.4.1 From a790bf6cc2bb63f0659d8c96b46f5f4db2f9d4bc Mon Sep 17 00:00:00 2001 From: vanhauser-thc Date: Sun, 23 Jan 2022 19:32:38 +0100 Subject: fix citation --- CITATION.cff | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 94841ec0..efd6cad8 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,17 +1,17 @@ cff-version: 1.2.0 message: "If you use this software, please cite it as below." authors: - - given-names: Heuse - family-names: Marc + - given-names: Marc + family-names: Heuse email: mh@mh-sec.de - - given-names: Eißfeldt - family-names: Heiko + - given-names: Heiko + family-names: Eißfeldt email: heiko.eissfeldt@hexco.de - - given-names: Fioraldi - family-names: Andrea + - given-names: Andrea + family-names: Fioraldi email: andreafioraldi@gmail.com - - given-names: Maier - family-names: Dominik + - given-names: Dominik + family-names: Meier email: mail@dmnk.co title: "AFL++" version: 3.14 -- cgit 1.4.1 From 7ab7862e4db75024cae98aecdc79d9247db355e7 Mon Sep 17 00:00:00 2001 From: Brendan Dolan-Gavitt Date: Sat, 29 Jan 2022 00:42:25 -0500 Subject: Build docker images for arm64 as well as x86. This involves: * A small change to the Dockerfile, so that it checks the target architecture and only installs gcc-multilib on x86_64. * Updates to the GitHub Actions workflow build_aflplusplus_docker.yaml to build for both linux/amd64 and linux/arm64. These changes should allow Mac M1 users to get a working version of AFL++ by doing "docker pull aflplusplus/aflplusplus". --- .github/workflows/build_aflplusplus_docker.yaml | 5 +++++ Dockerfile | 13 ++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_aflplusplus_docker.yaml b/.github/workflows/build_aflplusplus_docker.yaml index 8aa5b8f7..fa96da8e 100644 --- a/.github/workflows/build_aflplusplus_docker.yaml +++ b/.github/workflows/build_aflplusplus_docker.yaml @@ -12,6 +12,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 - name: Login to Dockerhub uses: docker/login-action@v1 with: @@ -21,5 +25,6 @@ jobs: uses: docker/build-push-action@v2 with: context: . + platforms: linux/amd64,linux/arm64 push: true tags: aflplusplus/aflplusplus:latest diff --git a/Dockerfile b/Dockerfile index a3c70746..53189657 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,13 +39,20 @@ RUN echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu focal main RUN apt-get update && apt-get full-upgrade -y && \ apt-get -y install --no-install-suggests --no-install-recommends \ - gcc-10 g++-10 gcc-10-plugin-dev gcc-10-multilib gcc-multilib gdb lcov \ + gcc-10 g++-10 gcc-10-plugin-dev gdb lcov \ clang-12 clang-tools-12 libc++1-12 libc++-12-dev \ libc++abi1-12 libc++abi-12-dev libclang1-12 libclang-12-dev \ libclang-common-12-dev libclang-cpp12 libclang-cpp12-dev liblld-12 \ liblld-12-dev liblldb-12 liblldb-12-dev libllvm12 libomp-12-dev \ - libomp5-12 lld-12 lldb-12 llvm-12 llvm-12-dev llvm-12-runtime llvm-12-tools \ - && rm -rf /var/lib/apt/lists/* + libomp5-12 lld-12 lldb-12 llvm-12 llvm-12-dev llvm-12-runtime llvm-12-tools + +# arm64 doesn't have gcc-multilib, and it's only used for -m32 support on x86 +ARG TARGETPLATFORM +RUN [ "$TARGETPLATFORM" = "linux/amd64" ] && \ + apt-get -y install --no-install-suggests --no-install-recommends \ + gcc-10-multilib gcc-multilib || true + +RUN rm -rf /var/lib/apt/lists/* RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 0 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 0 -- cgit 1.4.1