curstls: bump crustls version and use new URL

crustls moved to https://github.com/rustls/rustls-ffi. This also bumps
the expected version to 0.7.0.

Closes #7297
This commit is contained in:
Jacob Hoffman-Andrews 2021-06-24 19:43:19 -07:00 committed by Daniel Stenberg
parent f090c94b50
commit 6d972c8b1c
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 6 additions and 6 deletions

View File

@ -2,8 +2,8 @@
[Rustls is a TLS backend written in Rust.](https://docs.rs/rustls/). Curl can [Rustls is a TLS backend written in Rust.](https://docs.rs/rustls/). Curl can
be built to use it as an alternative to OpenSSL or other TLS backends. We use be built to use it as an alternative to OpenSSL or other TLS backends. We use
the [crustls C bindings](https://github.com/abetterinternet/crustls/). This the [rustls-ffi C bindings](https://github.com/rustls/rustls-ffi/). This
version of curl depends on version v0.6.0 of crustls. version of curl depends on version v0.7.0 of crustls.
# Building with rustls # Building with rustls
@ -12,7 +12,7 @@ First, [install Rust](https://rustup.rs/).
Next, check out, build, and install the appropriate version of crustls: Next, check out, build, and install the appropriate version of crustls:
% cargo install cbindgen % cargo install cbindgen
% git clone https://github.com/abetterinternet/crustls/ -b v0.6.0 % git clone https://github.com/rustls/rustls-ffi -b v0.7.0
% cd crustls % cd crustls
% make % make
% make DESTDIR=${HOME}/crustls-built/ install % make DESTDIR=${HOME}/crustls-built/ install
@ -22,5 +22,5 @@ Now configure and build curl with rustls:
% git clone https://github.com/curl/curl % git clone https://github.com/curl/curl
% cd curl % cd curl
% ./buildconf % ./buildconf
% ./configure --without-ssl --with-rustls=${HOME}/crustls-built % ./configure --with-rustls=${HOME}/crustls-built
% make % make

View File

@ -119,7 +119,7 @@ fi
if [ "$TRAVIS_OS_NAME" = linux -a "$RUSTLS_VERSION" ]; then if [ "$TRAVIS_OS_NAME" = linux -a "$RUSTLS_VERSION" ]; then
cd $HOME cd $HOME
git clone --depth=1 --recursive https://github.com/abetterinternet/crustls.git -b "$RUSTLS_VERSION" git clone --depth=1 --recursive https://github.com/rustls/rustls-ffi.git -b "$RUSTLS_VERSION"
curl https://sh.rustup.rs -sSf | sh -s -- -y curl https://sh.rustup.rs -sSf | sh -s -- -y
source $HOME/.cargo/env source $HOME/.cargo/env
cargo install cbindgen cargo install cbindgen

View File

@ -109,7 +109,7 @@
- libzstd-dev - libzstd-dev
curl_env: curl_env:
T: debug-rustls T: debug-rustls
RUSTLS_VERSION: v0.6.0 RUSTLS_VERSION: v0.7.0
C: >- C: >-
--with-rustls={{ ansible_user_dir }}/crust --with-rustls={{ ansible_user_dir }}/crust