Merge branch 'update-keymgr-todo' into 'main'

keymgr: Change "TODO hs" to "TODO HSS".

See merge request tpo/core/arti!1264

crates/tor-keymgr/src/key_type/ssh.rs

@@ -1,6 +1,6 @@
 //! Traits for converting keys to and from OpenSSH format.
 //
-// TODO hs: OpenSSH keys can have passphrases. While the current implementation isn't able to
+// TODO HSS (#902): OpenSSH keys can have passphrases. While the current implementation isn't able to
 // handle such keys, we will eventually need to support them (this will be a breaking API change).
 
 use ssh_key::private::KeypairData;

crates/tor-keymgr/src/keystore/arti.rs

@@ -105,6 +105,7 @@ impl KeyStore for ArtiNativeKeyStore {
     }
 
     fn has_key_bundle(&self, _key_spec: &dyn KeySpecifier) -> Result<bool> {
-        todo!()
+        // TODO HSS (#903): implement
+        Ok(true)
     }
 }

crates/tor-keymgr/src/mgr.rs

@@ -64,7 +64,7 @@ impl KeyMgr {
     /// If the key already exists, it is overwritten.
     ///
     // TODO hs: would it be useful for this API to return a Result<Option<K>> here (i.e. the old key)?
-    // TODO hs: define what "key bundle" means
+    // TODO HSS (#903): define what "key bundle" means
     pub fn insert<K: ToEncodableKey>(&self, key: K, key_spec: &dyn KeySpecifier) -> Result<()> {
         // TODO hs: maybe we should designate an explicit 'primary' store instead of implicitly
         // preferring the first one.