Migrate to separate newtype macros

Author: newpavlov

Cargo.lock

@@ -13,9 +13,8 @@ pub use digest::{self, Digest};
 mod block_api;
 pub use block_api::{BeltHashCore, belt_compress};
 
-digest::newtype!(
+digest::newtype_fixed_hash!(
     /// BelT hasher state.
     pub struct BeltHash(digest::core_api::CoreWrapper<BeltHashCore>);
-    delegate_template: FixedOutputHash
     oid: "1.2.112.0.2.0.34.101.31.81"
 );

belt-hash/src/lib.rs

@@ -18,28 +18,23 @@ pub use block_api::{Fsb160Core, Fsb224Core, Fsb256Core, Fsb384Core, Fsb512Core};
 
 use digest::core_api::CoreWrapper;
 
-digest::newtype!(
+digest::newtype_fixed_hash!(
     /// FSB-160 hasher.
     pub struct Fsb160(CoreWrapper<Fsb160Core>);
-    delegate_template: FixedOutputHash
 );
-digest::newtype!(
+digest::newtype_fixed_hash!(
     /// FSB-224 hasher.
     pub struct Fsb224(CoreWrapper<Fsb224Core>);
-    delegate_template: FixedOutputHash
 );
-digest::newtype!(
+digest::newtype_fixed_hash!(
     /// FSB-256 hasher.
     pub struct Fsb256(CoreWrapper<Fsb256Core>);
-    delegate_template: FixedOutputHash
 );
-digest::newtype!(
+digest::newtype_fixed_hash!(
     /// FSB-384 hasher.
     pub struct Fsb384(CoreWrapper<Fsb384Core>);
-    delegate_template: FixedOutputHash
 );
-digest::newtype!(
+digest::newtype_fixed_hash!(
     /// FSB-512 hasher.
     pub struct Fsb512(CoreWrapper<Fsb512Core>);
-    delegate_template: FixedOutputHash
 );

fsb/src/lib.rs

@@ -6,7 +6,10 @@ use digest::{
     core_api::{
         AlgorithmName, Block, Buffer, BufferKindUser, TruncSide, UpdateCore, VariableOutputCore,
     },
-    crypto_common::{BlockSizeUser, OutputSizeUser},
+    crypto_common::{
+        BlockSizeUser, OutputSizeUser,
+        hazmat::{DeserializeStateError, SerializableState, SerializedState},
+    },
     typenum::{U64, Unsigned},
 };
 
@@ -108,3 +111,17 @@ 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

@@ -22,43 +22,19 @@ use digest::{
 
 // note: we do not use `delegate_template: FixedOutputHash` because
 // `JhCore` does not implement `SerializableState`
-digest::newtype!(
+digest::newtype_fixed_hash!(
     /// JH-224 hasher.
     pub struct Jh224(CoreWrapper<CtVariableCoreWrapper<JhCore, U28>>);
-    delegate:
-        Debug Clone Default
-        AlgorithmName
-        BlockSizeUser OutputSizeUser
-        HashMarker Reset Update
-        FixedOutput FixedOutputReset
 );
-digest::newtype!(
+digest::newtype_fixed_hash!(
     /// JH-256 hasher.
     pub struct Jh256(CoreWrapper<CtVariableCoreWrapper<JhCore, U32>>);
-    delegate:
-        Debug Clone Default
-        AlgorithmName
-        BlockSizeUser OutputSizeUser
-        HashMarker Reset Update
-        FixedOutput FixedOutputReset
 );
-digest::newtype!(
+digest::newtype_fixed_hash!(
     /// JH-384 hasher.
     pub struct Jh384(CoreWrapper<CtVariableCoreWrapper<JhCore, U48>>);
-    delegate:
-        Debug Clone Default
-        AlgorithmName
-        BlockSizeUser OutputSizeUser
-        HashMarker Reset Update
-        FixedOutput FixedOutputReset
 );
-digest::newtype!(
+digest::newtype_fixed_hash!(
     /// JH-512 hasher.
     pub struct Jh512(CoreWrapper<CtVariableCoreWrapper<JhCore, U64>>);
-    delegate:
-        Debug Clone Default
-        AlgorithmName
-        BlockSizeUser OutputSizeUser
-        HashMarker Reset Update
-        FixedOutput FixedOutputReset
 );

jh/src/lib.rs

@@ -15,9 +15,8 @@ mod consts;
 
 pub use block_api::Md2Core;
 
-digest::newtype!(
+digest::newtype_fixed_hash!(
     /// MD2 hasher.
     pub struct Md2(digest::core_api::CoreWrapper<Md2Core>);
-    delegate_template: FixedOutputHash
     oid: "1.2.840.113549.2.2"
 );

md2/src/lib.rs

@@ -14,9 +14,8 @@ mod block_api;
 mod compress;
 pub use block_api::Md4Core;
 
-digest::newtype!(
+digest::newtype_fixed_hash!(
     /// MD4 hash.
     pub struct Md4(digest::core_api::CoreWrapper<Md4Core>);
-    delegate_template: FixedOutputHash
     oid: "1.2.840.113549.2.4"
 );

md4/src/lib.rs

@@ -14,9 +14,8 @@ mod compress;
 mod consts;
 pub use block_api::Md5Core;
 
-digest::newtype!(
+digest::newtype_fixed_hash!(
     /// MD5 hasher state.
     pub struct Md5(digest::core_api::CoreWrapper<Md5Core>);
-    delegate_template: FixedOutputHash
     oid: "1.2.840.113549.2.5"
 );

md5/src/lib.rs

@@ -25,26 +25,22 @@ use digest::core_api::CoreWrapper;
 // OpenSSL, GnuTLS, etc.) and the ISO one (1.0.10118.3.0.50/49), which seems
 // to be used by by Go and nobody else.
 
-digest::newtype!(
+digest::newtype_fixed_hash!(
     /// RIPEMD-128 hasher
     pub struct Ripemd128(CoreWrapper<Ripemd128Core>);
-    delegate_template: FixedOutputHash
     oid: "1.3.36.3.2.2"
 );
-digest::newtype!(
+digest::newtype_fixed_hash!(
     /// RIPEMD-160 hasher
     pub struct Ripemd160(CoreWrapper<Ripemd160Core>);
-    delegate_template: FixedOutputHash
     oid: "1.3.36.3.2.1"
 );
-digest::newtype!(
+digest::newtype_fixed_hash!(
     /// RIPEMD-256 hasher
     pub struct Ripemd256(CoreWrapper<Ripemd256Core>);
-    delegate_template: FixedOutputHash
     oid: "1.3.36.3.2.3"
 );
-digest::newtype!(
+digest::newtype_fixed_hash!(
     /// RIPEMD-320 hasher
     pub struct Ripemd320(CoreWrapper<Ripemd320Core>);
-    delegate_template: FixedOutputHash
 );

ripemd/src/lib.rs

@@ -4,7 +4,7 @@ use digest::{
     array::Array,
     block_buffer::Eager,
     core_api::{
-        AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, CoreWrapper, FixedOutputCore,
+        AlgorithmName, Block, BlockSizeUser, Buffer, BufferKindUser, FixedOutputCore,
         OutputSizeUser, Reset, UpdateCore,
     },
     crypto_common::hazmat::{DeserializeStateError, SerializableState, SerializedState},
@@ -26,13 +26,6 @@ pub struct Sha1Core {
     block_len: u64,
 }
 
-digest::newtype!(
-    /// SHA-1 hasher.
-    pub struct Sha1(CoreWrapper<Sha1Core>);
-    delegate_template: FixedOutputHash
-    oid: "1.3.14.3.2.26"
-);
-
 impl HashMarker for Sha1Core {}
 
 impl BlockSizeUser for Sha1Core {