diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e99f0f7a..fc6f3b30 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -106,8 +106,10 @@ jobs: - name: Build quictls/openssl v1.1.1 if: matrix.http3 == 'http3' && matrix.openssl == 'openssl1' run: | - git clone --depth 1 -b OpenSSL_1_1_1p+quic https://github.com/quictls/openssl + git clone --depth 1 -b OpenSSL_1_1_1q+quic https://github.com/quictls/openssl cd openssl + curl -L https://github.com/openssl/openssl/commit/60f011f584d80447e86cae1d1bd3ae24bc13235b.patch -o memcmp.patch + patch -p1 < memcmp.patch ./config --prefix=$PWD/build make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)" make install_sw @@ -117,7 +119,7 @@ jobs: unset CPPFLAGS unset LDFLAGS - git clone --depth 1 -b openssl-3.0.4+quic https://github.com/quictls/openssl + git clone --depth 1 -b openssl-3.0.5+quic https://github.com/quictls/openssl cd openssl ./config enable-ktls --prefix=$PWD/build --libdir=$PWD/build/lib make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)" diff --git a/README.rst b/README.rst index 92b5c80d..f4193122 100644 --- a/README.rst +++ b/README.rst @@ -147,7 +147,7 @@ To enable the experimental HTTP/3 support for h2load and nghttpx, the following libraries are required: * `OpenSSL with QUIC support - `_; or + `_; or `BoringSSL `_ (commit 27ffcc6e19bbafddf1b59ec0bc6df2904de7eb2c) * `ngtcp2 `_ >= 0.6.0 @@ -351,7 +351,7 @@ Build custom OpenSSL: .. code-block:: text - $ git clone --depth 1 -b OpenSSL_1_1_1p+quic https://github.com/quictls/openssl + $ git clone --depth 1 -b OpenSSL_1_1_1q+quic https://github.com/quictls/openssl $ cd openssl $ ./config --prefix=$PWD/build --openssldir=/etc/ssl $ make -j$(nproc) diff --git a/docker/Dockerfile b/docker/Dockerfile index ef57b68f..eb4b9008 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,7 +7,7 @@ RUN apt-get update && \ zlib1g-dev libev-dev libjemalloc-dev ruby-dev libc-ares-dev bison \ libelf-dev -RUN git clone --depth 1 -b OpenSSL_1_1_1p+quic https://github.com/quictls/openssl && \ +RUN git clone --depth 1 -b OpenSSL_1_1_1q+quic https://github.com/quictls/openssl && \ cd openssl && \ ./config --openssldir=/etc/ssl && \ make -j$(nproc) && \