hkdf: fix Debug impls (#90)

RustCrypto · Dec 13, 2023 · 1ac16e8 · 1ac16e8
1 parent 3023203
commit 1ac16e8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/hkdf/Cargo.toml b/hkdf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hkdf"
-version = "0.12.3" # Also update html_root_url in lib.rs when bumping this
+version = "0.12.4"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/RustCrypto/KDFs/"

diff --git a/hkdf/src/lib.rs b/hkdf/src/lib.rs
@@ -89,8 +89,7 @@
 #![no_std]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg",
-    html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg",
-    html_root_url = "https://docs.rs/hkdf/0.12.3"
+    html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/6ee8e381/logo.svg"
 )]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 #![forbid(unsafe_code)]
@@ -173,12 +172,13 @@ where
 
 impl<H, I> fmt::Debug for HkdfExtract<H, I>
 where
-    H: OutputSizeUser + AlgorithmName,
+    H: OutputSizeUser,
     I: HmacImpl<H>,
+    I::Core: AlgorithmName,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.write_str("HkdfExtract<")?;
-        <H as AlgorithmName>::write_alg_name(f)?;
+        <I::Core as AlgorithmName>::write_alg_name(f)?;
         f.write_str("> { ... }")
     }
 }
@@ -273,12 +273,13 @@ impl<H: OutputSizeUser, I: HmacImpl<H>> Hkdf<H, I> {
 
 impl<H, I> fmt::Debug for Hkdf<H, I>
 where
-    H: OutputSizeUser + AlgorithmName,
+    H: OutputSizeUser,
     I: HmacImpl<H>,
+    I::Core: AlgorithmName,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.write_str("Hkdf<")?;
-        <H as AlgorithmName>::write_alg_name(f)?;
+        <I::Core as AlgorithmName>::write_alg_name(f)?;
         f.write_str("> { ... }")
     }
 }

diff --git a/hkdf/tests/tests.rs b/hkdf/tests/tests.rs
@@ -446,3 +446,10 @@ new_test!(
     "wycheproof-sha512",
     SimpleHkdf::<Sha512>
 );
+
+#[test]
+fn test_debug_impls() {
+    fn needs_debug<T: std::fmt::Debug>() {}
+    needs_debug::<Hkdf<Sha256>>();
+    needs_debug::<HkdfExtract<Sha256>>();
+}