update

Author: newpavlov

Cargo.lock

@@ -283,6 +283,7 @@ impl SerializableState for AsconXofCore {
 digest::newtype_fixed_hash!(
     /// Ascon-Hash256
     pub struct AsconHash256(AsconCore);
+    impl: FixedHashTraits;
 );
 
 digest::newtype_xof_hash!(

ascon-hash/src/lib.rs

@@ -16,5 +16,6 @@ pub use block_api::{BeltHashCore, belt_compress};
 digest::newtype_fixed_hash!(
     /// BelT hasher state.
     pub struct BeltHash(BeltHashCore);
-    oid: "1.2.112.0.2.0.34.101.31.81"
+    oid: "1.2.112.0.2.0.34.101.31.81";
+    impl: FixedHashTraits;
 );

belt-hash/src/lib.rs

@@ -10,23 +10,21 @@
 #![cfg_attr(feature = "simd", feature(platform_intrinsics, repr_simd))]
 #![cfg_attr(feature = "simd", allow(incomplete_features))]
 
-#[cfg(feature = "std")]
-extern crate std;
-
 pub use digest::{self, Digest};
 
 use core::{fmt, marker::PhantomData, ops::Div};
 use digest::{
-    FixedOutput, HashMarker, InvalidOutputSize, MacMarker, Output, Update, VarOutputCustomized,
+    CustomizedInit, FixedOutput, HashMarker, InvalidOutputSize, MacMarker, Output, Update,
+    VarOutputCustomized,
     array::{Array, ArraySize},
     block_buffer::{Lazy, LazyBuffer},
     consts::{U4, U16, U32, U64, U128},
     core_api::{
-        AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, CoreWrapper, CtOutWrapper,
-        OutputSizeUser, RtVariableCoreWrapper, TruncSide, UpdateCore, VariableOutputCore,
+        AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, OutputSizeUser, TruncSide,
+        UpdateCore, VariableOutputCore,
     },
     crypto_common::{InvalidLength, Key, KeyInit, KeySizeUser},
-    typenum::{IsLessOrEqual, LeEq, NonZero, Unsigned},
+    typenum::{IsLessOrEqual, LeEq, NonZero, True, Unsigned},
 };
 #[cfg(feature = "reset")]
 use digest::{FixedOutputReset, Reset};
@@ -62,12 +60,32 @@ blake2_impl!(
     "Blake2b instance with a fixed output.",
 );
 
-/// BLAKE2b which allows to choose output size at runtime.
-pub type Blake2bVar = RtVariableCoreWrapper<Blake2bVarCore>;
-/// Core hasher state of BLAKE2b generic over output size.
-pub type Blake2bCore<OutSize> = CtOutWrapper<Blake2bVarCore, OutSize>;
-/// BLAKE2b generic over output size.
-pub type Blake2b<OutSize> = CoreWrapper<Blake2bCore<OutSize>>;
+digest::newtype_ct_variable_hash!(
+    /// BLAKE2b generic over output size.
+    pub struct Blake2b<OutSize>(Blake2bVarCore);
+    exclude: SerializableState;
+    max_size: U64;
+);
+
+// TODO: impl in the macro
+impl<OutSize> CustomizedInit for Blake2b<OutSize>
+where
+    OutSize: ArraySize + IsLessOrEqual<U64, Output = True>,
+{
+    fn new_customized(customization: &[u8]) -> Self {
+        Self {
+            core: CustomizedInit::new_customized(customization),
+            buffer: Default::default(),
+        }
+    }
+}
+
+digest::newtype_rt_variable_hash!(
+    /// BLAKE2b which allows to choose output size at runtime.
+    pub struct Blake2bVar(Blake2bVarCore);
+    exclude: SerializableState;
+);
+
 /// BLAKE2b-128 hasher state.
 pub type Blake2b128 = Blake2b<U16>;
 /// BLAKE2b-256 hasher state.
@@ -96,12 +114,32 @@ blake2_impl!(
     "Blake2s instance with a fixed output.",
 );
 
-/// BLAKE2s which allows to choose output size at runtime.
-pub type Blake2sVar = RtVariableCoreWrapper<Blake2sVarCore>;
-/// Core hasher state of BLAKE2s generic over output size.
-pub type Blake2sCore<OutSize> = CtOutWrapper<Blake2sVarCore, OutSize>;
-/// BLAKE2s generic over output size.
-pub type Blake2s<OutSize> = CoreWrapper<Blake2sCore<OutSize>>;
+digest::newtype_ct_variable_hash!(
+    /// BLAKE2s generic over output size.
+    pub struct Blake2s<OutSize>(Blake2sVarCore);
+    exclude: SerializableState;
+    max_size: U32;
+);
+
+// TODO: impl in the macro
+impl<OutSize> CustomizedInit for Blake2s<OutSize>
+where
+    OutSize: ArraySize + IsLessOrEqual<U32, Output = True>,
+{
+    fn new_customized(customization: &[u8]) -> Self {
+        Self {
+            core: CustomizedInit::new_customized(customization),
+            buffer: Default::default(),
+        }
+    }
+}
+
+digest::newtype_rt_variable_hash!(
+    /// BLAKE2s which allows to choose output size at runtime.
+    pub struct Blake2sVar(Blake2sVarCore);
+    exclude: SerializableState;
+);
+
 /// BLAKE2s-128 hasher state.
 pub type Blake2s128 = Blake2s<U16>;
 /// BLAKE2s-256 hasher state.

blake2/src/lib.rs

@@ -19,20 +19,25 @@ pub use block_api::{Fsb160Core, Fsb224Core, Fsb256Core, Fsb384Core, Fsb512Core};
 digest::newtype_fixed_hash!(
     /// FSB-160 hasher.
     pub struct Fsb160(Fsb160Core);
+    impl: FixedHashTraits;
 );
 digest::newtype_fixed_hash!(
     /// FSB-224 hasher.
     pub struct Fsb224(Fsb224Core);
+    impl: FixedHashTraits;
 );
 digest::newtype_fixed_hash!(
     /// FSB-256 hasher.
     pub struct Fsb256(Fsb256Core);
+    impl: FixedHashTraits;
 );
 digest::newtype_fixed_hash!(
     /// FSB-384 hasher.
     pub struct Fsb384(Fsb384Core);
+    impl: FixedHashTraits;
 );
 digest::newtype_fixed_hash!(
     /// FSB-512 hasher.
     pub struct Fsb512(Fsb512Core);
+    impl: FixedHashTraits;
 );

fsb/src/lib.rs

@@ -19,6 +19,7 @@ use params::Gost94Params;
 digest::newtype_fixed_hash!(
     /// GOST94 hash function generic over parameters.
     pub struct Gost94<P: Gost94Params>(Gost94Core<P>);
+    impl: FixedHashTraits;
 );
 
 /// GOST94 hash function with CryptoPro parameters.

gost94/src/lib.rs

@@ -6,7 +6,6 @@ use digest::{
         AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, Eager, OutputSizeUser,
         TruncSide, UpdateCore, VariableOutputCore,
     },
-    crypto_common::hazmat::{DeserializeStateError, SerializableState, SerializedState},
     typenum::{U64, Unsigned},
 };
 
@@ -108,17 +107,3 @@ impl Drop for JhCore {
 
 #[cfg(feature = "zeroize")]
 impl digest::zeroize::ZeroizeOnDrop for JhCore {}
-
-impl SerializableState for JhCore {
-    type SerializedStateSize = U64;
-
-    fn serialize(&self) -> SerializedState<Self> {
-        todo!()
-    }
-
-    fn deserialize(
-        _serialized_state: &SerializedState<Self>,
-    ) -> Result<Self, DeserializeStateError> {
-        todo!()
-    }
-}

jh/src/block_api.rs

@@ -23,16 +23,20 @@ use digest::{
 digest::newtype_fixed_hash!(
     /// JH-224 hasher.
     pub struct Jh224(CtOutWrapper<JhCore, U28>);
+    impl: BaseFixedTraits Default Clone HashMarker Reset FixedOutputReset;
 );
 digest::newtype_fixed_hash!(
     /// JH-256 hasher.
     pub struct Jh256(CtOutWrapper<JhCore, U32>);
+    impl: BaseFixedTraits Default Clone HashMarker Reset FixedOutputReset;
 );
 digest::newtype_fixed_hash!(
     /// JH-384 hasher.
     pub struct Jh384(CtOutWrapper<JhCore, U48>);
+    impl: BaseFixedTraits Default Clone HashMarker Reset FixedOutputReset;
 );
 digest::newtype_fixed_hash!(
     /// JH-512 hasher.
     pub struct Jh512(CtOutWrapper<JhCore, U64>);
+    impl: BaseFixedTraits Default Clone HashMarker Reset FixedOutputReset;
 );

jh/src/lib.rs

@@ -18,5 +18,6 @@ pub use block_api::Md2Core;
 digest::newtype_fixed_hash!(
     /// MD2 hasher.
     pub struct Md2(Md2Core);
-    oid: "1.2.840.113549.2.2"
+    oid: "1.2.840.113549.2.2";
+    impl: FixedHashTraits;
 );

md2/src/lib.rs

@@ -17,5 +17,6 @@ pub use block_api::Md4Core;
 digest::newtype_fixed_hash!(
     /// MD4 hash.
     pub struct Md4(Md4Core);
-    oid: "1.2.840.113549.2.4"
+    oid: "1.2.840.113549.2.4";
+    impl: FixedHashTraits;
 );