zuul: use the new rustls directory name

Follow-up to 6d972c8b1c which missed updating this directory name.

Also no longer call it crustls in the docs and bump to rusttls-ffi 0.7.1

Closes #7311
This commit is contained in:
Daniel Stenberg 2021-06-29 08:27:01 +02:00
parent ca8893468f
commit 8ccc066b45
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 7 additions and 7 deletions

View File

@ -3,24 +3,24 @@
[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 [rustls-ffi C bindings](https://github.com/rustls/rustls-ffi/). This the [rustls-ffi C bindings](https://github.com/rustls/rustls-ffi/). This
version of curl depends on version v0.7.0 of crustls. version of curl depends on version v0.7.0 of rustls-ffi.
# Building with rustls # Building with rustls
First, [install Rust](https://rustup.rs/). 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 rustls-ffi:
% cargo install cbindgen % cargo install cbindgen
% git clone https://github.com/rustls/rustls-ffi -b v0.7.0 % git clone https://github.com/rustls/rustls-ffi -b v0.7.0
% cd crustls % cd rustls-ffi
% make % make
% make DESTDIR=${HOME}/crustls-built/ install % make DESTDIR=${HOME}/rustls-ffi-built/ install
Now configure and build curl with rustls: 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 --with-rustls=${HOME}/crustls-built % ./configure --with-rustls=${HOME}/rustls-ffi-built
% make % make

View File

@ -123,7 +123,7 @@ if [ "$TRAVIS_OS_NAME" = linux -a "$RUSTLS_VERSION" ]; then
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
cd $HOME/crustls cd $HOME/rustls-ffi
make make
make DESTDIR=$HOME/crust install make DESTDIR=$HOME/crust install
fi fi

View File

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