From 6d972c8b1cbb39d5c95b70f542d940e6e68b244d Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Thu, 24 Jun 2021 19:43:19 -0700
Subject: [PATCH] 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
---
 docs/RUSTLS.md                  | 8 ++++----
 scripts/travis/before_script.sh | 2 +-
 zuul.d/jobs.yaml                | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/RUSTLS.md b/docs/RUSTLS.md
index c12b70a60..b04f008ca 100644
--- 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 257420e81..b7a321bcb 100755
--- 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 c0b06c9c9..684b96e93 100644
--- 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