Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cifuzz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
permissions: {}
jobs:
Fuzzing:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
security-events: write
steps:
Expand Down
7 changes: 6 additions & 1 deletion tests/fuzzing/oss-fuzz.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ unset CXXFLAGS
unset RUSTFLAGS
export AFL_NOOPT=1

apt-get install -y libev-dev libjemalloc-dev python2-dev libxml2-dev libpython2-dev libc-ares-dev libsystemd-dev libevent-dev libjansson-dev zlib1g-dev sudo autoconf libtool pkg-config
apt-get install -y libev-dev libjemalloc-dev python3-dev libxml2-dev libpython3-dev libpsl-dev libc-ares-dev libsystemd-dev libevent-dev libjansson-dev zlib1g-dev sudo autoconf libtool pkg-config
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=nightly
export PATH="/root/.cargo/bin:${PATH}"

Expand Down Expand Up @@ -63,6 +63,11 @@ cp /opt/h3-tools-boringssl/boringssl/lib/libssl.so $OUT/lib/
cp /opt/h3-tools-boringssl/boringssl/lib/libcrypto.so $OUT/lib/
cp /opt/h3-tools-boringssl/quiche/lib/libquiche.so $OUT/lib/
cp /opt/h3-tools-boringssl/quiche/lib/libquiche.so $OUT/lib/libquiche.so.0

cd $OUT/lib
ln -sf libswoc.so.1.5.15 libswoc.so.1
ln -sf libswoc.so.1.5.15 libswoc.so

export LD_LIBRARY_PATH=$OUT/lib/
ldconfig

Expand Down
14 changes: 10 additions & 4 deletions tools/build_boringssl_h3_tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ else
OS="linux"
fi

go_version=1.24.1
go_version=1.24.12
wget https://go.dev/dl/go${go_version}.${OS}-${ARCH}.tar.gz
rm -rf ${BASE}/go && tar -C ${BASE} -xf go${go_version}.${OS}-${ARCH}.tar.gz
rm go${go_version}.${OS}-${ARCH}.tar.gz
Expand All @@ -121,7 +121,7 @@ GO_BINARY_PATH=${BASE}/go/bin/go
if [ ! -d boringssl ]; then
git clone https://boringssl.googlesource.com/boringssl
cd boringssl
git checkout 45b2464158379f48cec6e35a1ef503ddea1511a6
git checkout 02bc0949e5cac0e1ee82c6f365f5a6c3cfd0cfa9
cd ..
fi
cd boringssl
Expand All @@ -146,18 +146,24 @@ cmake \
-DGO_EXECUTABLE=${GO_BINARY_PATH} \
-DCMAKE_INSTALL_PREFIX=${BASE}/boringssl \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS='-Wno-error=ignored-attributes -UBORINGSSL_HAVE_LIBUNWIND' \
-DCMAKE_CXX_FLAGS='-Wno-error=character-conversion -Wno-error=ignored-attributes -UBORINGSSL_HAVE_LIBUNWIND' \
-DCMAKE_C_FLAGS=${BSSL_C_FLAGS} \
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-DBUILD_TESTING=0 \
-DCMAKE_THREAD_LIBS_INIT="-lpthread" \
-DTHREADS_PREFER_PTHREAD_FLAG=ON \
-DBUILD_SHARED_LIBS=1
cmake \
-B build-static \
-DGO_EXECUTABLE=${GO_BINARY_PATH} \
-DCMAKE_INSTALL_PREFIX=${BASE}/boringssl \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS='-Wno-error=ignored-attributes -UBORINGSSL_HAVE_LIBUNWIND' \
-DCMAKE_CXX_FLAGS='-Wno-error=character-conversion -Wno-error=ignored-attributes -UBORINGSSL_HAVE_LIBUNWIND' \
-DCMAKE_C_FLAGS="${BSSL_C_FLAGS}" \
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-DBUILD_TESTING=0 \
-DCMAKE_THREAD_LIBS_INIT="-lpthread" \
-DTHREADS_PREFER_PTHREAD_FLAG=ON \
-DBUILD_SHARED_LIBS=0
cmake --build build-shared -j ${num_threads}
cmake --build build-static -j ${num_threads}
Expand Down