walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #1751 from nghttp2/bump-quictls 

Bump quictls
This commit is contained in:
Tatsuhiro Tsujikawa 2022-07-06 22:58:26 +09:00 committed by GitHub
parent ffe1519366 02a3a15b82
commit 3d35558f0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View File

@ -106,8 +106,10 @@ jobs:
- name: Build quictls/openssl v1.1.1 - name: Build quictls/openssl v1.1.1
if: matrix.http3 == 'http3' && matrix.openssl == 'openssl1' if: matrix.http3 == 'http3' && matrix.openssl == 'openssl1'
run: | 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 cd openssl
curl -L https://github.com/openssl/openssl/commit/60f011f584d80447e86cae1d1bd3ae24bc13235b.patch -o memcmp.patch
patch -p1 < memcmp.patch
./config --prefix=$PWD/build ./config --prefix=$PWD/build
make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)" make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)"
make install_sw make install_sw
@ -117,7 +119,7 @@ jobs:
unset CPPFLAGS unset CPPFLAGS
unset LDFLAGS 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 cd openssl
./config enable-ktls --prefix=$PWD/build --libdir=$PWD/build/lib ./config enable-ktls --prefix=$PWD/build --libdir=$PWD/build/lib
make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)" make -j"$(nproc 2> /dev/null || sysctl -n hw.ncpu)"

4
README.rst
View File

@ -147,7 +147,7 @@ To enable the experimental HTTP/3 support for h2load and nghttpx, the
following libraries are required: following libraries are required:
* `OpenSSL with QUIC support * `OpenSSL with QUIC support
<https://github.com/quictls/openssl/tree/OpenSSL_1_1_1p+quic>`_; or <https://github.com/quictls/openssl/tree/OpenSSL_1_1_1q+quic>`_; or
`BoringSSL <https://boringssl.googlesource.com/boringssl/>`_ (commit `BoringSSL <https://boringssl.googlesource.com/boringssl/>`_ (commit
27ffcc6e19bbafddf1b59ec0bc6df2904de7eb2c) 27ffcc6e19bbafddf1b59ec0bc6df2904de7eb2c)
* `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ >= 0.6.0 * `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ >= 0.6.0
@ -351,7 +351,7 @@ Build custom OpenSSL:
.. code-block:: text .. 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 $ cd openssl
$ ./config --prefix=$PWD/build --openssldir=/etc/ssl $ ./config --prefix=$PWD/build --openssldir=/etc/ssl
$ make -j$(nproc) $ make -j$(nproc)

2
docker/Dockerfile
View File

@ -7,7 +7,7 @@ RUN apt-get update && \
zlib1g-dev libev-dev libjemalloc-dev ruby-dev libc-ares-dev bison \ zlib1g-dev libev-dev libjemalloc-dev ruby-dev libc-ares-dev bison \
libelf-dev 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 && \ cd openssl && \
./config --openssldir=/etc/ssl && \ ./config --openssldir=/etc/ssl && \
make -j$(nproc) && \ make -j$(nproc) && \