ssh-key: derive Hash for Certificate

Rather than hand-implement

Signed-off-by: Ross Williams <ross@ross-williams.net>

Author: overhacked

ssh-key/src/certificate.rs

@@ -16,10 +16,7 @@ use alloc::{
     string::{String, ToString},
     vec::Vec,
 };
-use core::{
-    hash::{Hash, Hasher},
-    str::FromStr,
-};
+use core::{hash::Hash, str::FromStr};
 use encoding::{Base64Reader, CheckedSum, Decode, Encode, Reader, Writer};
 use signature::Verifier;
 
@@ -119,7 +116,7 @@ use {
 /// human-readable formats like JSON and TOML.
 ///
 /// [PROTOCOL.certkeys]: https://cvsweb.openbsd.org/src/usr.bin/ssh/PROTOCOL.certkeys?annotate=HEAD
-#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq, PartialOrd, Ord)]
 pub struct Certificate {
     /// CA-provided random bitstring of arbitrary length
     /// (but typically 16 or 32 bytes).
@@ -518,23 +515,6 @@ impl Encode for Certificate {
     }
 }
 
-impl Hash for Certificate {
-    #[inline]
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.public_key.hash(state);
-        self.serial.hash(state);
-        self.cert_type.hash(state);
-        self.key_id.hash(state);
-        self.valid_principals.hash(state);
-        self.valid_after.hash(state);
-        self.valid_before.hash(state);
-        self.critical_options.hash(state);
-        self.extensions.hash(state);
-        self.signature_key.hash(state);
-        self.signature.hash(state);
-    }
-}
-
 impl FromStr for Certificate {
     type Err = Error;
 

ssh-key/src/certificate/options_map.rs

@@ -4,12 +4,13 @@ use crate::{Error, Result};
 use alloc::{collections::BTreeMap, string::String, vec::Vec};
 use core::{
     cmp::Ordering,
+    hash::Hash,
     ops::{Deref, DerefMut},
 };
 use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
 
 /// Key/value map type used for certificate's critical options and extensions.
-#[derive(Clone, Debug, Default, Eq, PartialEq, PartialOrd, Ord)]
+#[derive(Clone, Debug, Default, Eq, Hash, PartialEq, PartialOrd, Ord)]
 pub struct OptionsMap(pub BTreeMap<String, String>);
 
 impl OptionsMap {