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
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@ install:
- if [ ! -d /opt ]; then mkdir /opt; fi
- git clone https://github.com/nginx/nginx-tests
- hg clone http://hg.nginx.org/nginx
- git clone https://github.com/openssl/openssl
- git clone -v https://github.com/openssl/openssl -b 'OpenSSL_1_1_1-stable'

script:
- cd openssl
- git checkout OpenSSL_1_1_1 -b patched
- patch -p1 < ../patches/openssl.extensions.patch
- ./config -d
- make -j$JOBS 2>&1 > build.log || (cat build.log && exit 1)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ stream {

### Dependencies

* [OpenSSL](https://github.com/openssl) - 1.1.1 (dev master version)
* [OpenSSL](https://github.com/openssl) - 1.1.1 (branch OpenSSL_1_1_1-stable)

The master version OpenSSL is required because this module fetches the
extensions types declared at SSL/TLS Client Hello by using the new early
Expand Down
8 changes: 3 additions & 5 deletions docker/debian-nginx-ssl-ja3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,12 @@ VOLUME ["/build/nginx-ssl-ja3"]
# Get test framework
RUN git clone https://github.com/nginx/nginx-tests

# Get openssl master from git
RUN git clone https://github.com/openssl/openssl

# Build and install openssl
WORKDIR /build/openssl

RUN git checkout OpenSSL_1_1_1 -b patched
RUN git clone -v https://github.com/openssl/openssl -b 'OpenSSL_1_1_1-stable'
COPY patches/openssl.extensions.patch /build/openssl

WORKDIR /build/openssl
RUN patch -p1 < openssl.extensions.patch
RUN ./config -d
RUN make
Expand Down
162 changes: 0 additions & 162 deletions patches/nginx.1.14.0.ssl.extensions.patch

This file was deleted.

90 changes: 0 additions & 90 deletions patches/nginx.1.15.9.ssl.extensions.patch

This file was deleted.

Loading