Migrate to buffering macros (#678)

Author: newpavlov

.github/workflows/sha3.yml

@@ -42,7 +42,7 @@ jobs:
           toolchain: ${{ matrix.rust }}
           targets: ${{ matrix.target }}
       - uses: RustCrypto/actions/cargo-hack-install@master
-      - run: cargo hack build --target ${{ matrix.target }} --each-feature --exclude-features default,std,asm
+      - run: cargo hack build --target ${{ matrix.target }} --each-feature --exclude-features default,asm
 
   test:
     needs: set-msrv

Cargo.lock

@@ -31,4 +31,5 @@ opt-level = 2
 
 [patch.crates-io]
 # https://github.com/RustCrypto/traits/pull/1787
+# https://github.com/RustCrypto/traits/pull/1799
 digest = { git = "https://github.com/RustCrypto/traits" }

Cargo.toml

@@ -9,12 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Edition changed to 2024 and MSRV bumped to 1.85 ([#652])
 - Relax MSRV policy and allow MSRV bumps in patch releases
 - Update to `digest` v0.11
+- Replace type aliases with newtypes [#678]
 - Adopt to changes from NIST draft
   - Remove `AsconAHash` and `AsconAXof`
   - Rename `AsonHash` to `AsconHAsh256`
   - Rename `AsconXof` to `AsconXof128`
 
 [#652]: https://github.com/RustCrypto/hashes/pull/652
+[#678]: https://github.com/RustCrypto/hashes/pull/678
 
 ## 0.2.0 (2023-03-21)
 ### Changed

ascon-hash/CHANGELOG.md

@@ -16,7 +16,7 @@ keywords = ["crypto", "hash", "ascon"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-digest = { version = "=0.11.0-pre.10", default-features = false, features = ["core-api"] }
+digest = "=0.11.0-pre.10"
 ascon = { version = "0.4", default-features = false }
 
 [dev-dependencies]
@@ -26,8 +26,8 @@ hex-literal = "1"
 base16ct = { version = "0.2", features = ["alloc"] }
 
 [features]
-default = ["std"]
-std = ["digest/std"]
+default = ["alloc"]
+alloc = ["digest/alloc"]
 zeroize = ["ascon/zeroize", "digest/zeroize"]
 
 [package.metadata.docs.rs]

ascon-hash/Cargo.toml

@@ -13,13 +13,12 @@ use ascon::State;
 pub use digest::{self, Digest, ExtendableOutput, Reset, Update, XofReader};
 use digest::{
     HashMarker, Output, OutputSizeUser,
-    block_buffer::Eager,
-    consts::{U8, U32},
-    core_api::{
-        AlgorithmName, Block, Buffer, BufferKindUser, CoreWrapper, ExtendableOutputCore,
-        FixedOutputCore, UpdateCore, XofReaderCore, XofReaderCoreWrapper,
+    block_api::{
+        AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, Eager, ExtendableOutputCore,
+        FixedOutputCore, UpdateCore, XofReaderCore,
     },
-    crypto_common::BlockSizeUser,
+    consts::{U8, U32, U40},
+    crypto_common::hazmat::{DeserializeStateError, SerializableState, SerializedState},
 };
 
 /// Produce mask for padding.
@@ -176,6 +175,26 @@ impl AlgorithmName for AsconCore {
     }
 }
 
+impl SerializableState for AsconCore {
+    type SerializedStateSize = U40;
+
+    fn serialize(&self) -> SerializedState<Self> {
+        self.state.state.as_bytes().into()
+    }
+
+    fn deserialize(
+        serialized_state: &SerializedState<Self>,
+    ) -> Result<Self, DeserializeStateError> {
+        let state = ascon::State::from(&serialized_state.0);
+        Ok(Self {
+            state: HashCore {
+                state,
+                phantom: PhantomData,
+            },
+        })
+    }
+}
+
 /// Ascon XOF
 #[derive(Clone, Debug, Default)]
 pub struct AsconXofCore {
@@ -241,29 +260,37 @@ impl AlgorithmName for AsconXofCore {
     }
 }
 
-/// Ascon-Hash256
-///
-/// ```
-/// use ascon_hash::{AsconHash256, Digest};
-///
-/// let mut hasher = AsconHash256::new();
-/// hasher.update(b"some bytes");
-/// let digest = hasher.finalize();
-/// assert_eq!(&digest[..], b"\xe9\x09\xc2\xf6\xda\x9c\xb3\x02\x84\x23\x26\x5c\x8f\x23\xfc\x2d\x26\xbf\xc0\xf3\xdb\x70\x46\x83\xef\x16\xb7\x87\xa9\x45\xed\x68");
-/// ```
-pub type AsconHash256 = CoreWrapper<AsconCore>;
-/// Ascon-XOF128
-///
-/// ```
-/// use ascon_hash::{AsconXof128, ExtendableOutput, Update, XofReader};
-///
-/// let mut xof = AsconXof128::default();
-/// xof.update(b"some bytes");
-/// let mut reader = xof.finalize_xof();
-/// let mut dst = [0u8; 5];
-/// reader.read(&mut dst);
-/// assert_eq!(&dst, b"\x8c\x7d\xd1\x14\xa0");
-/// ```
-pub type AsconXof128 = CoreWrapper<AsconXofCore>;
-/// Reader for AsconXOF output
-pub type AsconXof128Reader = XofReaderCoreWrapper<AsconXofReaderCore>;
+impl SerializableState for AsconXofCore {
+    type SerializedStateSize = U40;
+
+    fn serialize(&self) -> SerializedState<Self> {
+        self.state.state.as_bytes().into()
+    }
+
+    fn deserialize(
+        serialized_state: &SerializedState<Self>,
+    ) -> Result<Self, DeserializeStateError> {
+        let state = ascon::State::from(&serialized_state.0);
+        Ok(Self {
+            state: HashCore {
+                state,
+                phantom: PhantomData,
+            },
+        })
+    }
+}
+
+digest::buffer_fixed!(
+    /// Ascon-Hash256
+    pub struct AsconHash256(AsconCore);
+    impl: FixedHashTraits;
+);
+
+digest::buffer_xof!(
+    /// Ascon-XOF128 hasher.
+    pub struct AsconXof128(AsconXofCore);
+    impl: XofHasherTraits;
+    /// Ascon-XOF128 reader.
+    pub struct AsconXof128Reader(AsconXofReaderCore);
+    impl: XofReaderTraits;
+);

ascon-hash/src/lib.rs

@@ -6,12 +6,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## 0.2.0 (UNRELEASED)
+### Added
+- `alloc` crate feature ([#678])
+
 ### Changed
 - Edition changed to 2024 and MSRV bumped to 1.85 ([#652])
 - Relax MSRV policy and allow MSRV bumps in patch releases
 - Update to `digest` v0.11
+- Replace type aliases with newtypes ([#678])
+
+### Removed
+- `std` crate feature ([#678])
 
 [#652]: https://github.com/RustCrypto/hashes/pull/652
+[#678]: https://github.com/RustCrypto/hashes/pull/678
 
 ## 0.1.1 (2022-11-22)
 ### Added

belt-hash/CHANGELOG.md

@@ -22,8 +22,8 @@ hex-literal = "1"
 base16ct = { version = "0.2", features = ["alloc"] }
 
 [features]
-default = ["oid", "std"]
-std = ["digest/std"]
+default = ["alloc", "oid"]
+alloc = ["digest/alloc"]
 oid = ["digest/oid"]
 zeroize = ["digest/zeroize"]