Add support for the digest 0.11 traits

Author: jedisct1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hmac-sha1-compact"
-version = "1.1.6"
+version = "1.1.7"
 authors = ["Frank Denis <github@pureftpd.org>"]
 edition = "2018"
 description = "A small, self-contained SHA1 and HMAC-SHA1 implementation"
@@ -13,12 +13,14 @@ license = "ISC"
 [dependencies]
 digest09 = { package = "digest", version = "0.9.0", optional = true }
 digest010 = { package = "digest", version = "0.10.7", features = ["oid"], optional = true }
+digest011 = { package = "digest", version = "0.11.0-pre.9", features = ["oid"], optional = true }
 
 [features]
 default = []
-traits = ["traits09", "traits010"]
+traits = ["traits09", "traits010", "traits011"]
 traits09 = ["digest09"]
 traits010 = ["digest010"]
+traits011 = ["digest011"]
 
 [profile.release]
 lto = true

src/lib.rs

@@ -223,6 +223,14 @@ mod digest_trait09 {
 #[cfg(feature = "traits010")]
 pub type WrappedHash = digest010::core_api::CoreWrapper<Hash>;
 
+#[cfg(feature = "traits011")]
+digest011::buffer_fixed!(
+    /// Wrapped `Hash` type for the `Digest` trait (digest 0.11).
+    pub struct WrappedHash011(Hash);
+    oid: "1.3.14.3.2.26";
+    impl: Debug Clone Default Reset HashMarker BlockSizeUser OutputSizeUser Update FixedOutput FixedOutputReset;
+);
+
 #[cfg(feature = "traits010")]
 mod digest_trait010 {
     use core::fmt;
@@ -292,6 +300,75 @@ mod digest_trait010 {
     }
 }
 
+#[cfg(feature = "traits011")]
+mod digest_trait011 {
+    use core::fmt;
+
+    use digest011::{
+        block_buffer::Eager,
+        const_oid::{AssociatedOid, ObjectIdentifier},
+        consts::{U20, U64},
+        core_api::{
+            AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, FixedOutputCore,
+            OutputSizeUser, Reset, UpdateCore,
+        },
+        HashMarker,
+    };
+
+    use super::Hash;
+
+    impl AssociatedOid for Hash {
+        const OID: ObjectIdentifier = ObjectIdentifier::new_unwrap("1.3.14.3.2.26");
+    }
+
+    impl AlgorithmName for Hash {
+        fn write_alg_name(f: &mut fmt::Formatter<'_>) -> fmt::Result {
+            f.write_str("Sha1")
+        }
+    }
+
+    impl HashMarker for Hash {}
+
+    impl BufferKindUser for Hash {
+        type BufferKind = Eager;
+    }
+
+    impl BlockSizeUser for Hash {
+        type BlockSize = U64;
+    }
+
+    impl OutputSizeUser for Hash {
+        type OutputSize = U20;
+    }
+
+    impl UpdateCore for Hash {
+        #[inline]
+        fn update_blocks(&mut self, blocks: &[Block<Self>]) {
+            for block in blocks {
+                self._update(block)
+            }
+        }
+    }
+
+    impl FixedOutputCore for Hash {
+        fn finalize_fixed_core(
+            &mut self,
+            buffer: &mut Buffer<Self>,
+            out: &mut digest011::Output<Self>,
+        ) {
+            self._update(buffer.get_data());
+            let h = self.finalize();
+            out.copy_from_slice(&h);
+        }
+    }
+
+    impl Reset for Hash {
+        fn reset(&mut self) {
+            *self = Self::new()
+        }
+    }
+}
+
 #[test]
 fn main() {
     let h = Hash::hash(b"");
@@ -355,3 +432,25 @@ fn main_traits() {
         ]
     );
 }
+
+#[cfg(feature = "traits011")]
+#[test]
+fn main_traits011() {
+    use digest011::Digest;
+    let mut h = WrappedHash011::new();
+    Digest::update(&mut h, b"");
+    assert_eq!(
+        h.finalize().as_slice(),
+        &[218, 57, 163, 238, 94, 107, 75, 13, 50, 85, 191, 239, 149, 96, 24, 144, 175, 216, 7, 9]
+    );
+
+    let mut h = WrappedHash011::new();
+    Digest::update(&mut h, b"test");
+    assert_eq!(
+        h.finalize().as_slice(),
+        &[
+            169, 74, 143, 229, 204, 177, 155, 166, 28, 76, 8, 115, 211, 145, 233, 135, 152, 47,
+            187, 211
+        ]
+    );
+}