Skip to content

eax: replace iterator chain with simple for loops for tag XOR #804

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

Open
GarmashAlex wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −17
Open

eax: replace iterator chain with simple for loops for tag XOR #804

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 14 additions & 17 deletions eax/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,15 +252,13 @@ where

// 5. tag ← n ^ h ^ c
// (^ means xor)
let full_tag: Array<_, OutputSize<Cmac<Cipher>>> = n
.into_iter()
.zip(h)
.map(|(a, b)| a ^ b)
.zip(c)
.map(|(a, b)| a ^ b)
.take(OutputSize::<Cmac<Cipher>>::to_usize())
.collect();

let mut full_tag = n;
for (a, b) in full_tag.iter_mut().zip(&h) {
*a ^= *b;
}
for (a, b) in full_tag.iter_mut().zip(&c) {
*a ^= *b;
}
let tag = Tag::<M>::try_from(&full_tag[..M::to_usize()]).expect("tag size mismatch");
Ok(tag)
}
Expand All @@ -287,14 +285,13 @@ where

// 5. tag ← n ^ h ^ c
// (^ means xor)
let expected_tag: Array<_, OutputSize<Cmac<Cipher>>> = n
.into_iter()
.zip(h)
.map(|(a, b)| a ^ b)
.zip(c)
.map(|(a, b)| a ^ b)
.take(OutputSize::<Cmac<Cipher>>::to_usize())
.collect();
let mut expected_tag = n;
for (a, b) in expected_tag.iter_mut().zip(&h) {
*a ^= *b;
}
for (a, b) in expected_tag.iter_mut().zip(&c) {
*a ^= *b;
}

let expected_tag = &expected_tag[..tag.len()];

Expand Down
Loading