Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
perkfly committed Dec 11, 2023
1 parent 032ff00 commit aa8e4f8
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 10 deletions.
8 changes: 3 additions & 5 deletions Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ RUN tar xf ${NSS_VERSION}.tar.gz && \
{{#chrome}}
# BoringSSL doesn't have versions. Choose a commit that is used in a stable
# Chromium version.
ARG BORING_SSL_COMMIT=dd5219451c3ce26221762a15d867edf43b463bb2
ARG BORING_SSL_COMMIT=d24a38200fef19150eef00cad35b138936c08767
RUN curl -L https://github.com/google/boringssl/archive/${BORING_SSL_COMMIT}.zip -o boringssl.zip && \
unzip boringssl && \
mv boringssl-${BORING_SSL_COMMIT} boringssl
Expand Down Expand Up @@ -153,11 +153,10 @@ RUN cd ${CURL_VERSION} && \
--enable-websockets \
--with-nghttp2=/build/${NGHTTP2_VERSION}/installed \
--with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
--without-zstd \
{{#firefox}}
--with-nss=/build/${NSS_VERSION}/dist/Release \
--with-nss-deprecated \
--without-zstd \
--enable-ech \
CFLAGS="-I/build/${NSS_VERSION}/dist/public/nss -I/build/${NSS_VERSION}/dist/Release/include/nspr" \
{{/firefox}}
{{#chrome}}
Expand Down Expand Up @@ -195,11 +194,10 @@ RUN cd ${CURL_VERSION} && \
./configure --prefix=/build/install \
--with-nghttp2=/build/${NGHTTP2_VERSION}/installed \
--with-brotli=/build/brotli-${BROTLI_VERSION}/build/installed \
--without-zstd \
{{#firefox}}
--with-nss=/build/${NSS_VERSION}/dist/Release \
--with-nss-deprecated \
--without-zstd \
--enable-ech \
CFLAGS="-I/build/${NSS_VERSION}/dist/public/nss -I/build/${NSS_VERSION}/dist/Release/include/nspr" \
{{/firefox}}
{{#chrome}}
Expand Down
2 changes: 1 addition & 1 deletion chrome/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN cd brotli-${BROTLI_VERSION} && \

# BoringSSL doesn't have versions. Choose a commit that is used in a stable
# Chromium version.
ARG BORING_SSL_COMMIT=dd5219451c3ce26221762a15d867edf43b463bb2
ARG BORING_SSL_COMMIT=d24a38200fef19150eef00cad35b138936c08767
RUN curl -L https://github.com/google/boringssl/archive/${BORING_SSL_COMMIT}.zip -o boringssl.zip && \
unzip boringssl && \
mv boringssl-${BORING_SSL_COMMIT} boringssl
Expand Down
2 changes: 1 addition & 1 deletion chrome/Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN cd brotli-${BROTLI_VERSION} && \

# BoringSSL doesn't have versions. Choose a commit that is used in a stable
# Chromium version.
ARG BORING_SSL_COMMIT=dd5219451c3ce26221762a15d867edf43b463bb2
ARG BORING_SSL_COMMIT=d24a38200fef19150eef00cad35b138936c08767
RUN curl -L https://github.com/google/boringssl/archive/${BORING_SSL_COMMIT}.zip -o boringssl.zip && \
unzip boringssl && \
mv boringssl-${BORING_SSL_COMMIT} boringssl
Expand Down
1 change: 0 additions & 1 deletion firefox/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ RUN cd ${CURL_VERSION} && \
--with-nss=/build/${NSS_VERSION}/dist/Release \
--with-nss-deprecated \
--without-zstd \
--enable-ech \
CFLAGS="-I/build/${NSS_VERSION}/dist/public/nss -I/build/${NSS_VERSION}/dist/Release/include/nspr" \
USE_CURL_SSLKEYLOGFILE=true && \
make && make install
Expand Down
1 change: 0 additions & 1 deletion firefox/Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ RUN cd ${CURL_VERSION} && \
--with-nss=/build/${NSS_VERSION}/dist/Release \
--with-nss-deprecated \
--without-zstd \
--enable-ech \
CFLAGS="-I/build/${NSS_VERSION}/dist/public/nss -I/build/${NSS_VERSION}/dist/Release/include/nspr" \
USE_CURL_SSLKEYLOGFILE=true && \
make && make install
Expand Down
2 changes: 1 addition & 1 deletion tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ For each supported browser, the following tests are performed:
The following tests are still missing:
- [ ] Test that `curl-impersonate` sends the same HTTP/2 SETTINGS as the browser.
- [ ] Capture traffic automatically from different browsers
- [ ] Update safari versions, double `rsa_pss_rsae_sha384`
- [x] Update safari versions, double `rsa_pss_rsae_sha384`

0 comments on commit aa8e4f8

Please sign in to comment.