From ddacfef45ca05fd5bf49467f37583d7362df1672 Mon Sep 17 00:00:00 2001
From: Gabriela Moldovan <gabi@torproject.org>
Date: Thu, 24 Aug 2023 11:29:49 +0100
Subject: [PATCH] tor-keymgr: Bump ssh-key to 0.6.1 and remove unnecessary
 dependency.

Now that [ssh-key 0.6.1] is out, we no longer need the explicit sec1
dependency in tor-keymgr.

[ssh-key 0.6.1]: https://github.com/RustCrypto/SSH/pull/155
---
 Cargo.lock                   |  5 ++---
 crates/tor-keymgr/Cargo.toml | 12 +-----------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 60da709f1..7a049cb40 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3766,9 +3766,9 @@ dependencies = [
 
 [[package]]
 name = "ssh-key"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b0a17fec6ea344bfa1cda3aed2f0696fddc6295cfcc8c454a3bf58b8ffaabeb"
+checksum = "728fdf5286c394f12d83eaad51190af629aade5494813ce6b57f7425f1ca51b7"
 dependencies = [
  "p256",
  "p384",
@@ -4673,7 +4673,6 @@ dependencies = [
  "fs-mistrust",
  "itertools",
  "rand 0.8.5",
- "sec1",
  "serde",
  "serde_json",
  "ssh-key",
diff --git a/crates/tor-keymgr/Cargo.toml b/crates/tor-keymgr/Cargo.toml
index 51f6921b3..8aa4f0eaa 100644
--- a/crates/tor-keymgr/Cargo.toml
+++ b/crates/tor-keymgr/Cargo.toml
@@ -31,18 +31,8 @@ dyn-clone = "1.0.11"
 fs-mistrust = { path = "../fs-mistrust", version = "0.7.3", features = ["serde", "walkdir"] }
 itertools = "0.11.0"
 rand = "0.8"
-# TODO HSS: this is not actually a direct dependency of tor-keymgr. It is added
-# here to satisfy the minimal-versions check, which would otherwise fail, as
-# ssh-key has a hard dependency on 0.7.3.
-
-# Adding `-p sec1:0.7.3` to the update command from in
-# maint/downgrade_dependencies doesn't work because cargo isn't won't be able
-# select sec1@0.7.3 after downgrading the dependencies.
-#
-# See https://github.com/RustCrypto/SSH/issues/153
-sec1 = "0.7.3"
 serde = { version = "1.0.103", features = ["derive"] }
-ssh-key = { version = "0.6.0", features = ["std"] }
+ssh-key = { version = "0.6.1", features = ["std"] }
 thiserror = "1"
 tor-config = { path = "../tor-config", version = "0.9.3" }
 tor-error = { path = "../tor-error", version = "0.5.3" }