Skip to content

Commit 7f5bdce

Browse files
authored
Merge pull request #43 from fooinha/fix/issues
should fix #41 and #23
2 parents 82efc5a + b89b80e commit 7f5bdce

9 files changed

+45
-454
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ install:
2828
- if [ ! -d /opt ]; then mkdir /opt; fi
2929
- git clone https://github.com/nginx/nginx-tests
3030
- hg clone http://hg.nginx.org/nginx
31-
- git clone https://github.com/openssl/openssl
31+
- git clone -v https://github.com/openssl/openssl -b 'OpenSSL_1_1_1-stable'
3232

3333
script:
3434
- cd openssl
35-
- git checkout OpenSSL_1_1_1 -b patched
3635
- patch -p1 < ../patches/openssl.extensions.patch
3736
- ./config -d
3837
- make -j$JOBS 2>&1 > build.log || (cat build.log && exit 1)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ stream {
6868

6969
### Dependencies
7070

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

7373
The master version OpenSSL is required because this module fetches the
7474
extensions types declared at SSL/TLS Client Hello by using the new early

docker/debian-nginx-ssl-ja3/Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,12 @@ VOLUME ["/build/nginx-ssl-ja3"]
5959
# Get test framework
6060
RUN git clone https://github.com/nginx/nginx-tests
6161

62-
# Get openssl master from git
63-
RUN git clone https://github.com/openssl/openssl
6462

6563
# Build and install openssl
66-
WORKDIR /build/openssl
67-
68-
RUN git checkout OpenSSL_1_1_1 -b patched
64+
RUN git clone -v https://github.com/openssl/openssl -b 'OpenSSL_1_1_1-stable'
6965
COPY patches/openssl.extensions.patch /build/openssl
66+
67+
WORKDIR /build/openssl
7068
RUN patch -p1 < openssl.extensions.patch
7169
RUN ./config -d
7270
RUN make

patches/nginx.1.14.0.ssl.extensions.patch

Lines changed: 0 additions & 162 deletions
This file was deleted.

patches/nginx.1.15.9.ssl.extensions.patch

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)