SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Frida Makefile.toml fix (#969)

Browse Source 
* frida build script fix

* fix

* Update build_and_test.yml

* Update build_and_test.yml

* Update build_and_test.yml

* Update build_and_test.yml

* Update build_and_test.yml

* Update build_and_test.yml

* Update build_and_test.yml

* Update build_and_test.yml

* Update build_and_test.yml
This commit is contained in:
Dongjia "toka" Zhang 2022-12-26 14:19:37 +09:00 committed by GitHub
parent 75f12bd0eb
commit 476cb7e7dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_and_test.yml vendored
View File

@ -176,7 +176,7 @@ jobs:
- name: Install python - name: Install python
# Removing macOS things already installed in CI against failed linking # Removing macOS things already installed in CI against failed linking
if: runner.os == 'macOS' if: runner.os == 'macOS'
run: rm /usr/local/bin/2to3 /usr/local/bin/idle3 /usr/local/bin/pydoc3 /usr/local/bin/python3 /usr/local/bin/python3-config; brew install --force-bottle --overwrite python run: rm /usr/local/bin/2to3* /usr/local/bin/idle3* /usr/local/bin/pydoc3* /usr/local/bin/python3*; brew install --force-bottle --overwrite python
- uses: lyricwulf/abc@v1 - uses: lyricwulf/abc@v1
with: with:
# todo: remove afl++-clang when nyx support samcov_pcguard # todo: remove afl++-clang when nyx support samcov_pcguard

7
fuzzers/frida_libpng/Makefile.toml
View File

@ -1,10 +1,7 @@
# Variables # Variables
[env] [env]
CARGO_TARGET_DIR = { value = "${CARGO_MAKE_WORKING_DIRECTORY}${SEP}target", condition = { env_not_set = ["CARGO_TARGET_DIR"] } } CARGO_TARGET_DIR = { value = "target", condition = { env_not_set = ["CARGO_TARGET_DIR"] } }
SEP={ source = "${CARGO_MAKE_RUST_TARGET_OS}", default_value = "/", mapping = {"linux" = "/", "macos" = "/", "windows" = "\\"} }
FUZZER_NAME={ source = "${CARGO_MAKE_RUST_TARGET_OS}", default_value = "frida_fuzzer", mapping = {"linux" = "frida_fuzzer", "macos" = "frida_fuzzer", "windows" = "frida_fuzzer.exe"} } FUZZER_NAME={ source = "${CARGO_MAKE_RUST_TARGET_OS}", default_value = "frida_fuzzer", mapping = {"linux" = "frida_fuzzer", "macos" = "frida_fuzzer", "windows" = "frida_fuzzer.exe"} }
FUZZER = '${CARGO_TARGET_DIR}${SEP}release${SEP}${FUZZER_NAME}'
[tasks.unsupported] [tasks.unsupported]
@ -72,7 +69,7 @@ windows_alias = "fuzzer_windows"
script_runner="@shell" script_runner="@shell"
script=''' script='''
cargo build --release cargo build --release
cp ${CARGO_TARGET_DIR}${SEP}release${SEP}${FUZZER_NAME} . cp ${CARGO_TARGET_DIR}/release/${FUZZER_NAME} .
''' '''
[tasks.fuzzer_windows] [tasks.fuzzer_windows]

2
libafl/src/bolts/cli.rs
View File

@ -282,7 +282,7 @@ pub struct FuzzerOptions {
pub cores: Cores, pub cores: Cores,
/// port on which the broker should listen /// port on which the broker should listen
#[arg(short = 'p', long, default_value = "1337", value_name = "PORT")] #[arg(short = 'p', long, default_value = "31337", value_name = "PORT")]
pub broker_port: u16, pub broker_port: u16,
/// ip:port where a remote broker is already listening /// ip:port where a remote broker is already listening