Skip to content

ctr: use BlockEncrypt instead of BlockEncryptMut #14

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

Closed
tarcieri wants to merge 1 commit into from
Closed

ctr: use BlockEncrypt instead of BlockEncryptMut #14

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
26 changes: 13 additions & 13 deletions ctr/src/ctr_core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::{backend::Closure, CtrFlavor};
use cipher::{
crypto_common::{InnerUser, IvSizeUser},
AlgorithmName, BlockCipher, BlockEncryptMut, BlockSizeUser, InnerIvInit, Iv, IvState,
AlgorithmName, BlockCipher, BlockEncrypt, BlockSizeUser, InnerIvInit, Iv, IvState,
StreamCipherCore, StreamCipherSeekCore, StreamClosure,
};
use core::fmt;
Expand All @@ -13,7 +13,7 @@ use cipher::zeroize::ZeroizeOnDrop;
#[derive(Clone)]
pub struct CtrCore<C, F>
where
C: BlockEncryptMut + BlockCipher,
C: BlockEncrypt + BlockCipher,
F: CtrFlavor<C::BlockSize>,
{
cipher: C,
Expand All @@ -22,15 +22,15 @@ where

impl<C, F> BlockSizeUser for CtrCore<C, F>
where
C: BlockEncryptMut + BlockCipher,
C: BlockEncrypt + BlockCipher,
F: CtrFlavor<C::BlockSize>,
{
type BlockSize = C::BlockSize;
}

impl<C, F> StreamCipherCore for CtrCore<C, F>
where
C: BlockEncryptMut + BlockCipher,
C: BlockEncrypt + BlockCipher,
F: CtrFlavor<C::BlockSize>,
{
#[inline]
Expand All @@ -41,13 +41,13 @@ where
#[inline]
fn process_with_backend(&mut self, f: impl StreamClosure<BlockSize = Self::BlockSize>) {
let Self { cipher, ctr_nonce } = self;
cipher.encrypt_with_backend_mut(Closure::<F, _, _> { ctr_nonce, f });
cipher.encrypt_with_backend(Closure::<F, _, _> { ctr_nonce, f });
}
}

impl<C, F> StreamCipherSeekCore for CtrCore<C, F>
where
C: BlockEncryptMut + BlockCipher,
C: BlockEncrypt + BlockCipher,
F: CtrFlavor<C::BlockSize>,
{
type Counter = F::Backend;
Expand All @@ -65,23 +65,23 @@ where

impl<C, F> InnerUser for CtrCore<C, F>
where
C: BlockEncryptMut + BlockCipher,
C: BlockEncrypt + BlockCipher,
F: CtrFlavor<C::BlockSize>,
{
type Inner = C;
}

impl<C, F> IvSizeUser for CtrCore<C, F>
where
C: BlockEncryptMut + BlockCipher,
C: BlockEncrypt + BlockCipher,
F: CtrFlavor<C::BlockSize>,
{
type IvSize = C::BlockSize;
}

impl<C, F> InnerIvInit for CtrCore<C, F>
where
C: BlockEncryptMut + BlockCipher,
C: BlockEncrypt + BlockCipher,
F: CtrFlavor<C::BlockSize>,
{
#[inline]
Expand All @@ -95,7 +95,7 @@ where

impl<C, F> IvState for CtrCore<C, F>
where
C: BlockEncryptMut + BlockCipher,
C: BlockEncrypt + BlockCipher,
F: CtrFlavor<C::BlockSize>,
{
#[inline]
Expand All @@ -106,7 +106,7 @@ where

impl<C, F> AlgorithmName for CtrCore<C, F>
where
C: BlockEncryptMut + BlockCipher + AlgorithmName,
C: BlockEncrypt + BlockCipher + AlgorithmName,
F: CtrFlavor<C::BlockSize>,
{
fn write_alg_name(f: &mut fmt::Formatter<'_>) -> fmt::Result {
Expand All @@ -120,7 +120,7 @@ where

impl<C, F> fmt::Debug for CtrCore<C, F>
where
C: BlockEncryptMut + BlockCipher + AlgorithmName,
C: BlockEncrypt + BlockCipher + AlgorithmName,
F: CtrFlavor<C::BlockSize>,
{
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
Expand All @@ -136,7 +136,7 @@ where
#[cfg_attr(docsrs, doc(cfg(feature = "zeroize")))]
impl<C, F> ZeroizeOnDrop for CtrCore<C, F>
where
C: BlockEncryptMut + BlockCipher + ZeroizeOnDrop,
C: BlockEncrypt + BlockCipher + ZeroizeOnDrop,
F: CtrFlavor<C::BlockSize>,
F::CtrNonce: ZeroizeOnDrop,
{
Expand Down