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

diff --git a/docs/RUSTLS.md b/docs/RUSTLS.md
index c12b70a6010b7d52154f64657ecfccf9aa3ef530..b04f008cabbbed38249b925916cf410417853ef1 100644 (file)
--- a/docs/RUSTLS.md
+++ b/docs/RUSTLS.md
@@ -2,8 +2,8 @@
 
 [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
-the [crustls C bindings](https://github.com/abetterinternet/crustls/). This
-version of curl depends on version v0.6.0 of crustls.
+the [rustls-ffi C bindings](https://github.com/rustls/rustls-ffi/). This
+version of curl depends on version v0.7.0 of crustls.
 
 # Building with rustls
 
@@ -12,7 +12,7 @@ First, [install Rust](https://rustup.rs/).
 Next, check out, build, and install the appropriate version of crustls:
 
     % 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
     % make
     % make DESTDIR=${HOME}/crustls-built/ install
@@ -22,5 +22,5 @@ Now configure and build curl with rustls:
     % git clone https://github.com/curl/curl
     % cd curl
     % ./buildconf
-    % ./configure --without-ssl --with-rustls=${HOME}/crustls-built
+    % ./configure --with-rustls=${HOME}/crustls-built
     % make

diff --git a/scripts/travis/before_script.sh b/scripts/travis/before_script.sh
index 257420e8119102eadd2ef1c92383248ad3e356bd..b7a321bcb82df63dafd70590af5cc3733b00d939 100755 (executable)
--- a/scripts/travis/before_script.sh
+++ b/scripts/travis/before_script.sh
@@ -119,7 +119,7 @@ fi
 
 if [ "$TRAVIS_OS_NAME" = linux -a "$RUSTLS_VERSION" ]; then
   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
   source $HOME/.cargo/env
   cargo install cbindgen

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index c0b06c9c94c348c384ef92c9102130f2ae8bd54d..684b96e93b48dfba83d60da4adfb5c5c76336b06 100644 (file)
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -109,7 +109,7 @@
         - libzstd-dev
       curl_env:
         T: debug-rustls
-        RUSTLS_VERSION: v0.6.0
+        RUSTLS_VERSION: v0.7.0
         C: >-
           --with-rustls={{ ansible_user_dir }}/crust