Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
19 changes: 17 additions & 2 deletions digest/src/buffer_macros/fixed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,21 @@ macro_rules! buffer_fixed {
const OID: $crate::const_oid::ObjectIdentifier =
$crate::const_oid::ObjectIdentifier::new_unwrap($oid);
}

impl$(< $( $lt $( : $clt $(+ $dlt )* )? ),+ >)? Drop for $name$(< $( $lt ),+ >)? {
#[inline]
fn drop(&mut self) {
#[cfg(feature = "zeroize")]
{
use $crate::zeroize::Zeroize;
self.core.zeroize();
self.buffer.zeroize();
}
}
}

#[cfg(feature = "zeroize")]
impl$(< $( $lt $( : $clt $(+ $dlt )* )? ),+ >)? $crate::zeroize::ZeroizeOnDrop for $name$(< $( $lt ),+ >)? {}
};

// Terminates `impl_inner` sequences.
Expand Down Expand Up @@ -183,8 +198,8 @@ macro_rules! buffer_fixed {
Self { core, buffer }
}
fn decompose(self) -> (Self::Core, $crate::block_api::Buffer<Self::Core>) {
let Self { core, buffer } = self;
(core, buffer)
let Self { ref core, ref buffer } = self;
(core.clone(), buffer.clone())
}
}

Expand Down
7 changes: 7 additions & 0 deletions digest/tests/dummy_fixed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,13 @@ mod block_api {
})
}
}

#[cfg(feature = "zeroize")]
impl zeroize::Zeroize for FixedHashCore {
fn zeroize(&mut self) {
self.state.zeroize()
}
}
}

digest::buffer_fixed!(
Expand Down