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

Merge pull request #1828 from nghttp2/bump-openssl 

Bump OpenSSL versions
This commit is contained in:
Tatsuhiro Tsujikawa 2022-11-09 18:57:52 +09:00 committed by GitHub
parent e91de24be6 b062e9f66c
commit 266a3d84e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,7 +106,7 @@ 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_1q+quic https://github.com/quictls/openssl git clone --depth 1 -b OpenSSL_1_1_1s+quic https://github.com/quictls/openssl
cd openssl cd openssl
./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)"
@ -117,7 +117,7 @@ jobs:
unset CPPFLAGS unset CPPFLAGS
unset LDFLAGS unset LDFLAGS
git clone --depth 1 -b openssl-3.0.5+quic https://github.com/quictls/openssl git clone --depth 1 -b openssl-3.0.7+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

@ -140,7 +140,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_1q+quic>`_; or <https://github.com/quictls/openssl/tree/OpenSSL_1_1_1s+quic>`_; or
`BoringSSL <https://boringssl.googlesource.com/boringssl/>`_ (commit `BoringSSL <https://boringssl.googlesource.com/boringssl/>`_ (commit
04989786e9ab16cef5261bbd05a2b1a8cb312dbf) 04989786e9ab16cef5261bbd05a2b1a8cb312dbf)
* `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ >= 0.10.0 * `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_ >= 0.10.0
@ -356,7 +356,7 @@ Build custom OpenSSL:
.. code-block:: text .. code-block:: text
$ git clone --depth 1 -b OpenSSL_1_1_1q+quic https://github.com/quictls/openssl $ git clone --depth 1 -b OpenSSL_1_1_1s+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_1q+quic https://github.com/quictls/openssl && \ RUN git clone --depth 1 -b OpenSSL_1_1_1s+quic https://github.com/quictls/openssl && \
cd openssl && \ cd openssl && \
./config --openssldir=/etc/ssl && \ ./config --openssldir=/etc/ssl && \
make -j$(nproc) && \ make -j$(nproc) && \