Skip to content

Use (Reset)MacTraits #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
newpavlov merged 2 commits into from
Mar 13, 2026
Merged

Use (Reset)MacTraits #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fa6000
Use `(Reset)MacTraits`
newpavlov Mar 13, 2026
3c67f52
Use published digest v0.11.2
newpavlov Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion belt-mac/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cbc-mac/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion cmac/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down
4 changes: 2 additions & 2 deletions hmac/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand All @@ -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> {
Expand Down
2 changes: 1 addition & 1 deletion pmac/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down
5 changes: 3 additions & 2 deletions retail-mac/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading