Auto merge of #109644 - pietroalbini:pa-1.68.2, r=pietroalbini

[stable] Prepare Rust 1.68.2 This PR prepares the 1.68.2 point release, including the following Cargo PRs: * rust-lang/cargo#11883 * rust-lang/cargo#11889 The following PR was also included as a pre-requisite for backporting: * rust-lang/cargo#11635 cc `@rust-lang/release` r? `@ghost`
rust-lang · Mar 27, 2023 · 9eb3afe · 9eb3afe
2 parents 8460ca8 + fa0aae4
commit 9eb3afe
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -342,7 +342,7 @@ dependencies = [
 
 [[package]]
 name = "cargo"
-version = "0.69.0"
+version = "0.69.1"
 dependencies = [
  "anyhow",
  "base64",

diff --git a/RELEASES.md b/RELEASES.md
@@ -1,3 +1,14 @@
+Version 1.68.2 (2023-03-28)
+===========================
+
+- [Update the GitHub RSA host key bundled within Cargo](https://github.com/rust-lang/cargo/pull/11883).
+  The key was [rotated by GitHub](https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/)
+  on 2023-03-24 after the old one leaked.
+- [Mark the old GitHub RSA host key as revoked](https://github.com/rust-lang/cargo/pull/11889).
+  This will prevent Cargo from accepting the leaked key even when trusted by
+  the system.
+- [Add support for `@revoked` and a better error message for `@cert-authority` in Cargo's SSH host key verification](https://github.com/rust-lang/cargo/pull/11635)
+
 Version 1.68.1 (2023-03-23)
 ===========================
 

diff --git a/src/tools/cargo b/src/tools/cargo
diff --git a/src/version b/src/version
@@ -1 +1 @@
-1.68.1
+1.68.2
+1 −1		Cargo.toml
+336 −52		src/cargo/sources/git/known_hosts.rs
+1 −1		src/doc/src/reference/semver.md