Skip to content

Commit 3854a2e

Browse files
tokatokadomenukk
authored andcommitted
LibAFL: Remove tui_monitor from default features (AFLplusplus#2685)
* No Usermode default * no tui * gg * try fix CI * fmt --------- Co-authored-by: Dominik Maier <[email protected]>
1 parent 6c0ef01 commit 3854a2e

File tree

10 files changed

+16
-11
lines changed

10 files changed

+16
-11
lines changed

fuzzers/baby/baby_fuzzer/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ opt-level = 3
2323
debug = true
2424

2525
[dependencies]
26-
libafl = { path = "../../../libafl" }
26+
libafl = { path = "../../../libafl", features = ["tui_monitor"] }
2727
libafl_bolts = { path = "../../../libafl_bolts" }
2828
log = { version = "0.4.22", features = ["release_max_level_info"] }

fuzzers/baby/baby_fuzzer_swap_differential/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ bindgen = "0.70.1"
2525
cc = "1.1.21"
2626

2727
[dependencies]
28-
libafl = { path = "../../../libafl" }
28+
libafl = { path = "../../../libafl", features = ["tui_monitor"] }
2929
libafl_bolts = { path = "../../../libafl_bolts" }
3030
libafl_targets = { path = "../../../libafl_targets", features = [
3131
"sancov_pcguard_hitcounts",

fuzzers/baby/baby_fuzzer_unicode/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ opt-level = 3
2323
debug = true
2424

2525
[dependencies]
26-
libafl = { path = "../../../libafl", features = ["unicode"] }
26+
libafl = { path = "../../../libafl", features = ["unicode", "tui_monitor"] }
2727
libafl_bolts = { path = "../../../libafl_bolts" }
2828
log = { version = "0.4.22", features = ["release_max_level_info"] }

fuzzers/binary_only/qemu_launcher/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ vergen-git2 = "1.0.1"
4242

4343
[dependencies]
4444
clap = { version = "4.5.18", features = ["derive", "string"] }
45-
libafl = { path = "../../../libafl" }
45+
libafl = { path = "../../../libafl", features = ["tui_monitor"] }
4646
libafl_bolts = { path = "../../../libafl_bolts", features = [
4747
"errors_backtrace",
4848
] }

fuzzers/full_system/nyx_libxml2_standalone/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55
default-run = "nyx_libxml2_standalone"
66

77
[dependencies]
8-
libafl = { path = "../../../libafl" }
8+
libafl = { path = "../../../libafl", features = ["tui_monitor"] }
99
libafl_bolts = { path = "../../../libafl_bolts" }
1010
libafl_cc = { path = "../../../libafl_cc" }
1111
libafl_nyx = { path = "../../../libafl_nyx" }

fuzzers/structure_aware/baby_fuzzer_multi/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ opt-level = 3
2424
debug = true
2525

2626
[dependencies]
27-
libafl = { path = "../../../libafl", features = ["multipart_inputs"] }
27+
libafl = { path = "../../../libafl", features = [
28+
"multipart_inputs",
29+
"tui_monitor",
30+
] }
2831
libafl_bolts = { path = "../../../libafl_bolts" }
2932
log = { version = "0.4.22", features = ["release_max_level_info"] }

libafl/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ default = [
3737
"gzip",
3838
"regex",
3939
"serdeany_autoreg",
40-
"tui_monitor",
4140
"libafl_bolts/xxh3",
4241
]
4342
document-features = ["dep:document-features"]

libafl_nyx/src/helper.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,13 @@ impl NyxHelper {
7171
let mut timeout = Duration::from_secs(u64::from(settings.timeout_secs));
7272
timeout += Duration::from_micros(u64::from(settings.timeout_micro_secs));
7373

74-
Ok(Self { nyx_process, nyx_stdout, timeout, bitmap_size, bitmap_buffer })
74+
Ok(Self {
75+
nyx_process,
76+
nyx_stdout,
77+
timeout,
78+
bitmap_size,
79+
bitmap_buffer,
80+
})
7581
}
7682

7783
/// Set a timeout for Nyx.

utils/cfg_builder/build.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
# First, add all the intra-procedural edges
3333

3434
for fname, v in module["edges"].items():
35-
3635
if fname not in fname2id:
3736
GG.add_node(f_ids, label=fname)
3837
fname2id[fname] = f_ids

utils/gramatron/construct_automata.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ def postprocess1():
219219

220220
# Cull transitions to states which were not expanded owing to the stack limit
221221
if stack_limit:
222-
223222
blocklist = []
224223
for final_state in final:
225224
for transition in pda:
@@ -287,7 +286,6 @@ def postprocess():
287286

288287
# Cull transitions to states which were not expanded owing to the stack limit
289288
if stack_limit:
290-
291289
blocklist = []
292290
for final_state in final:
293291
for transition in pda:

0 commit comments

Comments
 (0)