Skip to content

Update hmac #124

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
May 28, 2025
Merged

Update hmac #124

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
71a4c2f
Update `hmac`
newpavlov May 28, 2025
a5233ac
Tweak sealed impl
newpavlov May 28, 2025
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
24 changes: 12 additions & 12 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.

7 changes: 2 additions & 5 deletions hkdf/src/sealed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use hmac::digest::{
Digest, FixedOutput, KeyInit, Output, Update,
block_api::{BlockSizeUser, OutputSizeUser},
};
use hmac::{Hmac, SimpleHmac, block_api::EagerHash};
use hmac::{EagerHash, Hmac, SimpleHmac};

pub trait Sealed<H: OutputSizeUser> {
fn new_from_slice(key: &[u8]) -> Self;
Expand All @@ -12,10 +12,7 @@ pub trait Sealed<H: OutputSizeUser> {
fn finalize(self) -> Output<H>;
}

impl<H> Sealed<H> for Hmac<H>
where
H: EagerHash + OutputSizeUser,
{
impl<H: EagerHash> Sealed<H> for Hmac<H> {
#[inline(always)]
fn new_from_slice(key: &[u8]) -> Self {
KeyInit::new_from_slice(key).expect("HMAC can take a key of any size")
Expand Down
6 changes: 3 additions & 3 deletions hkdf/tests/rfc5869.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use hex_literal::hex;
use hkdf::{Hkdf, hmac::block_api::EagerHash};
use hkdf::{Hkdf, hmac::EagerHash};
use sha1::Sha1;
use sha2::{Sha256, digest::OutputSizeUser};
use sha2::Sha256;

struct Test<'a> {
ikm: &'a [u8],
Expand All @@ -11,7 +11,7 @@ struct Test<'a> {
okm: &'a [u8],
}

fn rfc_test<H: OutputSizeUser + EagerHash>(tests: &[Test]) {
fn rfc_test<H: EagerHash>(tests: &[Test]) {
let mut buf = [0u8; 128];
for test in tests.iter() {
let salt = if test.salt.is_empty() {
Expand Down