Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit11a5e37

Browse files
Merge pull request#2486 from AFLplusplus/dev
push to stable
2 parents16cc444 +5348754 commit11a5e37

File tree

77 files changed

+1349
-1664
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1349
-1664
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 73 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,79 @@ on:
99
branches:
1010
-dev# No need for stable-pull-request, as that equals dev-push
1111

12+
concurrency:
13+
group:${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress:true
15+
1216
jobs:
17+
check-compiler-passes-old:
18+
runs-on:ubuntu-22.04
19+
strategy:
20+
matrix:
21+
version:[14, 15]
22+
env:
23+
AFL_SKIP_CPUFREQ:1
24+
AFL_I_DONT_CARE_ABOUT_MISSING_CRASHES:1
25+
steps:
26+
-uses:actions/checkout@v4
27+
-name:update
28+
run:sudo apt-get update && sudo apt-get upgrade -y
29+
-name:debug
30+
run:apt-cache search plugin-dev | grep gcc-; echo; apt-cache search clang-format- | grep clang-format-
31+
-name:install packages
32+
run:sudo apt-get install -y -m -f build-essential git libtool libtool-bin automake flex bison libglib2.0-0 libc++-dev findutils libcmocka-dev python3-dev python3-setuptools ninja-build python3-pip gcc-12-plugin-dev
33+
-name:install llvm-tools
34+
run:sudo apt install -y clang-${{ matrix.version }} llvm-${{ matrix.version }}
35+
-name:install clang-rt (for llvm 15)
36+
# because ubuntu-22.04 already has this package
37+
if:matrix.version != '15'
38+
run:sudo apt install -y libclang-${{ matrix.version }}-dev
39+
-name:compiler installed
40+
run:gcc -v; echo; clang -v
41+
-name:build afl++
42+
run:export NO_NYX=1; export ASAN_BUILD=1; export LLVM_CONFIG=llvm-config-${{ matrix.version }}; make ASAN_BUILD=1 NO_NYX=1 LLVM_CONFIG=llvm-config-${{ matrix.version }} all
43+
-name:Check llvm passes
44+
run:make ASAN_BUILD=1 NO_NYX=1 LLVM_CONFIG=llvm-config-${{ matrix.version }} llvm-build-test || exit 1
45+
-name:run tests
46+
run:sudo -E ./afl-system-config; make tests
47+
check-compiler-passes-new:
48+
runs-on:ubuntu-24.04
49+
strategy:
50+
matrix:
51+
version:[16, 17, 18, 19, 20]
52+
env:
53+
AFL_SKIP_CPUFREQ:1
54+
AFL_I_DONT_CARE_ABOUT_MISSING_CRASHES:1
55+
steps:
56+
-uses:actions/checkout@v4
57+
-name:update
58+
run:sudo apt-get update && sudo apt-get upgrade -y
59+
-name:debug
60+
run:apt-cache search plugin-dev | grep gcc-; echo; apt-cache search clang-format- | grep clang-format-
61+
-name:install packages
62+
run:sudo apt-get install -y -m -f build-essential git libtool libtool-bin automake flex bison libglib2.0-0 libc++-dev findutils libcmocka-dev python3-dev python3-setuptools ninja-build python3-pip gcc-12-plugin-dev
63+
-name:install llvm-tools (20)
64+
if:matrix.version == '20'
65+
run:|
66+
wget https://apt.llvm.org/llvm.sh
67+
chmod +x llvm.sh
68+
sudo ./llvm.sh ${{ matrix.version }}
69+
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${{ matrix.version }} 200
70+
-name:install llvm-tools
71+
if:matrix.version != '20'
72+
run:sudo apt install -y clang-${{ matrix.version }} llvm-${{ matrix.version }}
73+
-name:install clang-rt
74+
if:matrix.version != '20'
75+
run:sudo apt install -y libclang-${{ matrix.version }}-dev
76+
-name:compiler installed
77+
run:gcc -v; echo; clang -v
78+
-name:build afl++
79+
run:export NO_NYX=1; export ASAN_BUILD=1; export LLVM_CONFIG=llvm-config-${{ matrix.version }}; make ASAN_BUILD=1 NO_NYX=1 LLVM_CONFIG=llvm-config-${{ matrix.version }} all
80+
-name:Check llvm passes
81+
run:make ASAN_BUILD=1 NO_NYX=1 LLVM_CONFIG=llvm-config-${{ matrix.version }} llvm-build-test || exit 1
82+
-name:run tests
83+
run:sudo -E ./afl-system-config; make tests
84+
1385
linux:
1486
runs-on:"${{ matrix.os }}"
1587
strategy:
@@ -31,7 +103,7 @@ jobs:
31103
-name:install gcc plugin
32104
run:sudo apt-get install -y -m -f --install-suggests $(readlink /usr/bin/gcc)-plugin-dev
33105
-name:build afl++
34-
run:export NO_NYX=1; export ASAN_BUILD=1; export LLVM_CONFIG=llvm-config-12; make ASAN_BUILD=1 NO_NYX=1 LLVM_CONFIG=llvm-config-12 distrib
106+
run:export NO_NYX=1; export ASAN_BUILD=1; export LLVM_CONFIG=llvm-config-15; make ASAN_BUILD=1 NO_NYX=1 LLVM_CONFIG=llvm-config-15 distrib
35107
-name:run tests
36108
run:sudo -E ./afl-system-config; make tests
37109
macos:

‎.github/workflows/code-format.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
branches:
1010
-dev# No need for stable-pull-request, as that equals dev-push
1111

12+
concurrency:
13+
group:${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress:true
15+
1216
jobs:
1317
code-format-check:
1418
name:Check code format

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
branches:
1010
-dev# No need for stable-pull-request, as that equals dev-push
1111

12+
concurrency:
13+
group:${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress:true
15+
1216
jobs:
1317
analyze:
1418
name:Analyze

‎.github/workflows/container.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ on:
1010
branches:
1111
-dev# No need for stable-pull-request, as that equals dev-push
1212

13+
concurrency:
14+
group:${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress:true
16+
1317
jobs:
1418
build-and-test-amd64:
1519
name:Test amd64 image

‎.github/workflows/rust_custom_mutator.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
branches:
1010
-dev# No need for stable-pull-request, as that equals dev-push
1111

12+
concurrency:
13+
group:${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress:true
15+
1216
jobs:
1317
test:
1418
name:Test Rust Custom Mutator Support

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ utils/persistent_mode/persistent_demo
108108
utils/persistent_mode/persistent_demo_new
109109
utils/persistent_mode/persistent_demo_new_compat
110110
utils/persistent_mode/test-instr
111+
utils/qemu_persistent_hook/mipsel_test
112+
utils/qemu_persistent_hook/test
111113
utils/replay_record/persistent_demo_replay
112114
utils/replay_record/persistent_demo_replay_compat
113115
utils/replay_record/persistent_demo_replay_argparse

‎Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# GCC 11 is used instead of 12 because genhtml for afl-cov doesn't like it.
66
#
77

8-
FROM ubuntu:22.04 AS aflplusplus
8+
FROM ubuntu:24.04 AS aflplusplus
99
LABEL"maintainer"="AFL++ team <afl@aflplus.plus>"
1010
LABEL"about"="AFLplusplus container image"
1111

@@ -17,7 +17,7 @@ ENV NO_NYX=1
1717

1818
### Only change these if you know what you are doing:
1919
# Current recommended LLVM version is 16
20-
ENV LLVM_VERSION=16
20+
ENV LLVM_VERSION=19
2121
# GCC 12 is producing compile errors for some targets so we stay at GCC 11
2222
ENV GCC_VERSION=11
2323

@@ -32,8 +32,8 @@ RUN apt-get update && apt-get full-upgrade -y && \
3232
apt-get install -y --no-install-recommends wget ca-certificates apt-utils && \
3333
rm -rf /var/lib/apt/lists/*
3434

35-
RUN echo"deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${LLVM_VERSION} main" > /etc/apt/sources.list.d/llvm.list && \
36-
wget -qO /etc/apt/keyrings/llvm-snapshot.gpg.key https://apt.llvm.org/llvm-snapshot.gpg.key
35+
#RUN echo "deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${LLVM_VERSION} main" > /etc/apt/sources.list.d/llvm.list && \
36+
# wget -qO /etc/apt/keyrings/llvm-snapshot.gpg.key https://apt.llvm.org/llvm-snapshot.gpg.key
3737

3838
RUN apt-get update && \
3939
apt-get -y install --no-install-recommends \
@@ -65,8 +65,8 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VERSION} 0
6565
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${LLVM_VERSION} 0 && \
6666
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${LLVM_VERSION} 0
6767

68-
RUN wget -qO- https://sh.rustup.rs | CARGO_HOME=/etc/cargo sh -s -- -y -q --no-modify-path
69-
ENV PATH=$PATH:/etc/cargo/bin
68+
#RUN wget -qO- https://sh.rustup.rs | CARGO_HOME=/etc/cargo sh -s -- -y -q --no-modify-path
69+
#ENV PATH=$PATH:/etc/cargo/bin
7070

7171
RUN apt clean -y
7272

‎GNUmakefile‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -255,17 +255,6 @@ ifeq "$(PYTHON_INCLUDE)" ""
255255
endif
256256
endif
257257

258-
# Old Ubuntu and others dont have python/python2-config so we hardcode 2.7
259-
ifeq "$(PYTHON_INCLUDE)" ""
260-
ifneq "$(shell command -v python2.7 2>/dev/null)" ""
261-
ifneq "$(shell command -v python2.7-config 2>/dev/null)" ""
262-
PYTHON_INCLUDE :=$(shell python2.7-config --includes)
263-
PYTHON_LIB :=$(shell python2.7-config --ldflags)
264-
PYTHON_VERSION :=$(strip$(shell python2.7 --version 2>&1))
265-
endif
266-
endif
267-
endif
268-
269258
ifdefSOURCE_DATE_EPOCH
270259
BUILD_DATE ?=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u "+%Y-%m-%d")
271260
else
@@ -356,6 +345,11 @@ llvm:
356345
-$(MAKE) -j$(nproc) -f GNUmakefile.llvm
357346
@test -e afl-cc|| {echo"[-] Compiling afl-cc failed. You seem not to have a working compiler.";exit 1; }
358347

348+
llvm-build-test:
349+
$(MAKE) -j$(nproc) -f GNUmakefile.llvm
350+
@test -e afl-cc|| {echo"[-] Compiling afl-cc failed. You seem not to have a working compiler.";exit 1; }
351+
352+
359353
.PHONY: gcc_plugin
360354
gcc_plugin:
361355
ifneq "$(SYS)" "Darwin"

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<imgalign="right"src="https://raw.githubusercontent.com/AFLplusplus/Website/main/static/aflpp_bg.svg"alt="AFL++ logo"width="250"height="250">
44

5-
Release version:[4.32c](https://github.com/AFLplusplus/AFLplusplus/releases)
5+
Release version:[4.33c](https://github.com/AFLplusplus/AFLplusplus/releases)
66

7-
GitHub version: 4.33a
7+
GitHub version: 4.33c
88

99
Repository:
1010
[https://github.com/AFLplusplus/AFLplusplus](https://github.com/AFLplusplus/AFLplusplus)

‎afl-addseeds‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/bin/sh
22

3-
test -z"$1" -o"$1" ="-h" -o"$1" ="--help"&& {
3+
test -z"$1" -o"$1" ="-h" -o"$1" ="-hh" -o"$1" ="--help"&& {
4+
echo afl-addseeds by Marc Heuse
5+
echo
46
echo Syntax: afl-addseeds -o afl-out-dir [-i seed_file_or_dir] seed_file_or_seed_dir seed_file_or_seed_dir ...
57
echo
68
echo Options:

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp