diff --git a/DEVELOPING.md b/DEVELOPING.md index 0aae790f5..069fb7496 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -84,7 +84,7 @@ to generate new unix man pages for that version : After successfully compiling Hush, you can generate a debian package of these binaries with: - ./zcutil/build-debian-package.sh + ./util/build-debian-package.sh This command will not work on Mac OS X. Currently you cannot generate a Debian package from operating systems other than Linux. Oh well. diff --git a/util/afl/afl-build.sh b/util/afl/afl-build.sh index a64d47de3..74d5980ce 100755 --- a/util/afl/afl-build.sh +++ b/util/afl/afl-build.sh @@ -2,9 +2,9 @@ # Copyright (c) 2016-2021 The Hush developers # Distributed under the GPLv3 software license, see the accompanying # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -# A wrapper around ./zcutil/build.sh for instrumenting the build with AFL: -# ./zcutil/afl/afl-build.sh -# You may obtain a copy of AFL using ./zcutil/afl/afl-get.sh. +# A wrapper around ./util/build.sh for instrumenting the build with AFL: +# ./util/afl/afl-build.sh +# You may obtain a copy of AFL using ./util/afl/afl-get.sh. set -eu -o pipefail @@ -12,11 +12,11 @@ export AFL_INSTALL_DIR=$(realpath "$1") FUZZ_CASE="$2" shift 2 export AFL_LOG_DIR="$(pwd)" -export ZCUTIL=$(realpath "./zcutil") +export UTIL=$(realpath "./util") cp "./src/fuzzing/$FUZZ_CASE/fuzz.cpp" src/fuzz.cpp -CONFIGURE_FLAGS="--enable-tests=no --enable-fuzz-main" "$ZCUTIL/build.sh" "CC=$ZCUTIL/afl/hush-wrapper-gcc" "CXX=$ZCUTIL/afl/hush-wrapper-g++" AFL_HARDEN=1 "$@" +CONFIGURE_FLAGS="--enable-tests=no --enable-fuzz-main" "$UTIL/build.sh" "CC=$UTIL/afl/hush-wrapper-gcc" "CXX=$UTIL/afl/hush-wrapper-g++" AFL_HARDEN=1 "$@" echo "You can now run AFL as follows:" -echo "$ ./zcutil/afl/afl-run.sh '$AFL_INSTALL_DIR' '$FUZZ_CASE'" +echo "$ ./util/afl/afl-run.sh '$AFL_INSTALL_DIR' '$FUZZ_CASE'" diff --git a/util/afl/afl-get.sh b/util/afl/afl-get.sh index 255adeb17..0156b5105 100755 --- a/util/afl/afl-get.sh +++ b/util/afl/afl-get.sh @@ -3,7 +3,7 @@ # Distributed under the GPLv3 software license, see the accompanying # file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html # Obtains and builds a copy of AFL from source. -# ./zcutil/afl/afl-get.sh +# ./util/afl/afl-get.sh set -eu -o pipefail @@ -32,5 +32,5 @@ make echo "You can now build hushd with AFL instrumentation as follows:" echo "$ make clean # if you've already built hushd without AFL instrumentation" -echo "$ ./zcutil/afl/afl-build.sh '$(pwd)' -j\$(nproc)" +echo "$ ./util/afl/afl-build.sh '$(pwd)' -j\$(nproc)" echo "...where is the name of a directory in src/fuzzing." diff --git a/util/afl/afl-getbuildrun.sh b/util/afl/afl-getbuildrun.sh index de9dba15b..5bd1986f9 100755 --- a/util/afl/afl-getbuildrun.sh +++ b/util/afl/afl-getbuildrun.sh @@ -16,8 +16,8 @@ export AFL_INSTALL_DIR=$(realpath "./afl-temp") if [ ! -d "$AFL_INSTALL_DIR" ]; then mkdir "$AFL_INSTALL_DIR" - ./zcutil/afl/afl-get.sh "$AFL_INSTALL_DIR" + ./util/afl/afl-get.sh "$AFL_INSTALL_DIR" fi -./zcutil/afl/afl-build.sh "$AFL_INSTALL_DIR" "$FUZZ_CASE" -j$(nproc) -./zcutil/afl/afl-run.sh "$AFL_INSTALL_DIR" "$FUZZ_CASE" "$@" +./util/afl/afl-build.sh "$AFL_INSTALL_DIR" "$FUZZ_CASE" -j$(nproc) +./util/afl/afl-run.sh "$AFL_INSTALL_DIR" "$FUZZ_CASE" "$@" diff --git a/util/build-arm.sh b/util/build-arm.sh index c721b3e57..a3a1b927b 100755 --- a/util/build-arm.sh +++ b/util/build-arm.sh @@ -22,7 +22,7 @@ EOF if [ "x$*" = 'x--help' ] then - cat ./zcutil/dragon.txt + cat ./util/dragon.txt cat <