Use (Reset)MacTraits (#254)

This PR reverts #250 and #253 since the relevant fix was added to
`digest` (see RustCrypto/traits#2341).

Author: newpavlov

Cargo.lock

@@ -20,7 +20,7 @@ digest::buffer_fixed!(
     /// BeltMac instance generic over block cipher.
     #[derive(Clone)]
     pub struct GenericBeltMac<C: BlockCipherEncrypt + SmallBlockSizeUser>(block_api::BeltMacCore<C>);
-    impl: BaseFixedTraits MacMarker Reset FixedOutputReset AlgorithmName InnerInit;
+    impl: ResetMacTraits AlgorithmName InnerInit;
 );
 
 /// BeltMac instance.

belt-mac/src/lib.rs

@@ -20,7 +20,7 @@ digest::buffer_fixed!(
     /// Generic CBC-MAC instance.
     #[derive(Clone)]
     pub struct CbcMac<C: BlockCipherEncrypt + SmallBlockSizeUser>(block_api::CbcMacCore<C>);
-    impl: BaseFixedTraits MacMarker Reset FixedOutputReset InnerInit;
+    impl: ResetMacTraits InnerInit;
 );
 
 impl<C> AlgorithmName for CbcMac<C>

cbc-mac/src/lib.rs

@@ -21,7 +21,7 @@ digest::buffer_fixed!(
     /// Generic CMAC instance.
     #[derive(Clone)]
     pub struct Cmac<C: CmacCipher>(block_api::CmacCore<C>);
-    impl: BaseFixedTraits MacMarker Reset FixedOutputReset InnerInit;
+    impl: ResetMacTraits InnerInit;
 );
 
 impl<C: CmacCipher + AlgorithmName> AlgorithmName for Cmac<C> {

cmac/src/lib.rs

@@ -37,7 +37,7 @@ digest::buffer_fixed!(
     /// Generic HMAC instance.
     #[derive(Clone)]
     pub struct Hmac<D: EagerHash>(block_api::HmacCore<D>);
-    impl: BaseFixedTraits MacMarker KeyInit;
+    impl: MacTraits KeyInit;
 );
 
 impl<D: EagerHash + AlgorithmName> AlgorithmName for Hmac<D> {
@@ -50,7 +50,7 @@ digest::buffer_fixed!(
     /// Generic HMAC instance with reset support.
     #[derive(Clone)]
     pub struct HmacReset<D: EagerHash>(block_api::HmacResetCore<D>);
-    impl: BaseFixedTraits MacMarker Reset FixedOutputReset KeyInit;
+    impl: ResetMacTraits KeyInit;
 );
 
 impl<D: EagerHash + AlgorithmName> AlgorithmName for HmacReset<D> {

hmac/src/lib.rs

@@ -21,7 +21,7 @@ digest::buffer_fixed!(
     /// Generic PMAC instance with `LC_SIZE` = 20.
     #[derive(Clone)]
     pub struct Pmac<C: PmacCipher>(block_api::PmacCore<C, 20>);
-    impl: BaseFixedTraits MacMarker Reset FixedOutputReset InnerInit;
+    impl: ResetMacTraits InnerInit;
 );
 
 impl<C: PmacCipher + AlgorithmName> AlgorithmName for Pmac<C> {

pmac/src/lib.rs

@@ -26,8 +26,9 @@ use digest::{
 
 digest::buffer_fixed!(
     /// Generic Retail MAC instance.
-    pub struct RetailMac<C: BlockCipherEncrypt + BlockCipherDecrypt + SmallBlockSizeUser >(RetailMacCore<C>);
-    impl: BaseFixedTraits MacMarker Reset FixedOutputReset;
+    #[derive(Clone)]
+    pub struct RetailMac<C: BlockCipherEncrypt + BlockCipherDecrypt + SmallBlockSizeUser>(RetailMacCore<C>);
+    impl: ResetMacTraits;
 );
 
 impl<C> KeySizeUser for RetailMac<C>