Skip to content

Fix regressions introduced in #1388 #1421

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 3 commits into from
Jan 4, 2024
Merged

Fix regressions introduced in #1388 #1421

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
288a5f6
Fix regressions introduced in #1388
lmaotrigine Dec 16, 2023
b337b30
That's what I get for using my mobile to code.
lmaotrigine Dec 16, 2023
f818851
God I miss force-with-lease
lmaotrigine Dec 16, 2023
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
10 changes: 7 additions & 3 deletions cipher/src/stream_wrapper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ impl<T: StreamCipherCore> StreamCipher for StreamCipherCoreWrapper<T> {
// but after XORing keystream block with `tail`, we immediately
// overwrite the first byte with a correct value.
self.core.write_keystream_block(&mut self.buffer);
tail.xor_in2out(&self.buffer[..data_len]);
tail.xor_in2out(&self.buffer[..tail.len()]);
tail.len()
};

Expand Down Expand Up @@ -219,19 +219,23 @@ impl<T: IvSizeUser + StreamCipherCore> IvSizeUser for StreamCipherCoreWrapper<T>
impl<T: KeyIvInit + StreamCipherCore> KeyIvInit for StreamCipherCoreWrapper<T> {
#[inline]
fn new(key: &Key<Self>, iv: &Iv<Self>) -> Self {
let mut buffer = Block::<T>::default();
buffer[0] = T::BlockSize::U8;
Self {
core: T::new(key, iv),
buffer: Default::default(),
buffer,
}
}
}

impl<T: KeyInit + StreamCipherCore> KeyInit for StreamCipherCoreWrapper<T> {
#[inline]
fn new(key: &Key<Self>) -> Self {
let mut buffer = Block::<T>::default();
buffer[0] = T::BlockSize::U8;
Self {
core: T::new(key),
buffer: Default::default(),
buffer,
}
}
}
Expand Down