Skip to content
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

Jump to bottom

Add Zeroize and Drop implementations #13

Closed
wants to merge 3 commits into from
Closed

Add Zeroize and Drop implementations #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f47b66
Add Zeroize and Drop implementations
emc2 Apr 11, 2019
c4497b3
Fix version numbers for zeroize
emc2 May 22, 2019
c150a87
Fix zeroize versions
emc2 Aug 2, 2019
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
1 change: 1 addition & 0 deletions cfb-mode/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ categories = ["cryptography", "no-std"]
[dependencies]
stream-cipher = "0.3"
block-cipher-trait = "0.6"
zeroize = { version = "0.9", optional = true }

[dev-dependencies]
aes = "0.3"
Expand Down
24 changes: 24 additions & 0 deletions cfb-mode/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,20 @@
pub extern crate stream_cipher;
extern crate block_cipher_trait;

#[cfg(cargo_feature = "zeroize")]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAICT #[cfg(cargo_feature = "zeroize")] does absolutely nothing. I think all of these need to be changed to #[cfg(feature = "zeroize")]

extern crate zeroize;

use stream_cipher::{StreamCipher, NewStreamCipher, InvalidKeyNonceLength};
use block_cipher_trait::BlockCipher;
use block_cipher_trait::generic_array::GenericArray;
use block_cipher_trait::generic_array::typenum::Unsigned;
use core::slice;

#[cfg(cargo_feature = "zeroize")]
use zeroize::Zeroize;
#[cfg(cargo_feature = "zeroize")]
use std::ops::Drop;

/// CFB self-synchronizing stream cipher instance.
pub struct Cfb<C: BlockCipher> {
cipher: C,
Expand All @@ -68,6 +76,22 @@ type Block<C> = GenericArray<u8, <C as BlockCipher>::BlockSize>;
type ParBlocks<C> = GenericArray<Block<C>, <C as BlockCipher>::ParBlocks>;
type Key<C> = GenericArray<u8, <C as BlockCipher>::KeySize>;

#[cfg(cargo_feature = "zeroize")]
impl<C: Zeroize> Zeroize for Cfb<C> {
fn zeroize(&mut self) {
self.cipher.zeroize();
self.iv.zeroize();
self.pos.zeroize();
}
}

#[cfg(cargo_feature = "zeroize")]
impl<C> Drop for Cfb<C> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These could potentially be:

#[cfg_attr(cargo_feature = "zeroize", derive(Zeroize, ZeroizeOnDrop))]

On pub struct Cfb<C: ... above.

fn drop(&mut self) {
self.zeroize();
}
}

impl<C: BlockCipher> NewStreamCipher for Cfb<C> {
type KeySize = C::KeySize;
type NonceSize = C::BlockSize;
Expand Down
1 change: 1 addition & 0 deletions cfb8/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ categories = ["cryptography", "no-std"]
[dependencies]
stream-cipher = "0.3"
block-cipher-trait = "0.6"
zeroize = { version = "0.9", optional = true }

[dev-dependencies]
aes = "0.3"
Expand Down
23 changes: 23 additions & 0 deletions cfb8/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,40 @@
extern crate block_cipher_trait;
pub extern crate stream_cipher;

#[cfg(cargo_feature = "zeroize")]
extern crate zeroize;

use stream_cipher::{NewStreamCipher, StreamCipher, InvalidKeyNonceLength};
use block_cipher_trait::BlockCipher;
use block_cipher_trait::generic_array::GenericArray;
use block_cipher_trait::generic_array::typenum::Unsigned;

#[cfg(cargo_feature = "zeroize")]
use zeroize::Zeroize;
#[cfg(cargo_feature = "zeroize")]
use std::ops::Drop;

/// CFB self-synchronizing stream cipher instance.
pub struct Cfb8<C: BlockCipher> {
cipher: C,
iv: GenericArray<u8, C::BlockSize>,
}

#[cfg(cargo_feature = "zeroize")]
impl<C: Zeroize> Zeroize for Cfb8<C> {
fn zeroize(&mut self) {
self.cipher.zeroize();
self.iv.zeroize();
}
}

#[cfg(cargo_feature = "zeroize")]
impl<C> Drop for Cfb8<C> {
fn drop(&mut self) {
self.zeroize();
}
}

impl<C: BlockCipher> NewStreamCipher for Cfb8<C> {
type KeySize = C::KeySize;
type NonceSize = C::BlockSize;
Expand Down
1 change: 1 addition & 0 deletions ctr/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ categories = ["cryptography", "no-std"]
[dependencies]
stream-cipher = "0.3"
block-cipher-trait = "0.6"
zeroize = { version = "0.9", optional = true }

[dev-dependencies]
aes = "0.3"
Expand Down
26 changes: 26 additions & 0 deletions ctr/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
pub extern crate stream_cipher;
extern crate block_cipher_trait;

#[cfg(cargo_feature = "zeroize")]
extern crate zeroize;

use stream_cipher::{
SyncStreamCipher, SyncStreamCipherSeek, NewStreamCipher,
LoopError, InvalidKeyNonceLength
Expand All @@ -51,6 +54,11 @@ use block_cipher_trait::generic_array::typenum::{U16, Unsigned};
use block_cipher_trait::BlockCipher;
use core::{mem, cmp, fmt, ptr};

#[cfg(cargo_feature = "zeroize")]
use zeroize::Zeroize;
#[cfg(cargo_feature = "zeroize")]
use std::ops::Drop;

#[inline(always)]
fn xor(buf: &mut [u8], key: &[u8]) {
debug_assert_eq!(buf.len(), key.len());
Expand All @@ -76,6 +84,24 @@ pub struct Ctr128<C>
pos: Option<u8>,
}

#[cfg(cargo_feature = "zeroize")]
impl<C: Zeroize> Zeroize for Ctr128<C> {
fn zeroize(&mut self) {
self.cipher.zeroize();
self.nonce.zeroize();
self.counter.zeroize();
self.block.zeroize();
self.pos.zeroize();
}
}

#[cfg(cargo_feature = "zeroize")]
impl<C> Drop for Ctr128<C> {
fn drop(&mut self) {
self.zeroize();
}
}

impl<C> Ctr128<C>
where
C: BlockCipher<BlockSize = U16>,
Expand Down
1 change: 1 addition & 0 deletions ofb/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ categories = ["cryptography", "no-std"]
[dependencies]
stream-cipher = "0.3"
block-cipher-trait = "0.6"
zeroize = { version = "0.9", optional = true }

[dev-dependencies]
aes = "0.3"
Expand Down
25 changes: 24 additions & 1 deletion ofb/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,21 @@
pub extern crate stream_cipher;
extern crate block_cipher_trait;

#[cfg(cargo_feature = "zeroize")]
extern crate zeroize;

use stream_cipher::{
SyncStreamCipher, NewStreamCipher, LoopError, InvalidKeyNonceLength,
};
use block_cipher_trait::BlockCipher;
use block_cipher_trait::generic_array::GenericArray;
use block_cipher_trait::generic_array::typenum::Unsigned;

#[cfg(cargo_feature = "zeroize")]
use zeroize::Zeroize;
#[cfg(cargo_feature = "zeroize")]
use std::ops::Drop;

type Block<C> = GenericArray<u8, <C as BlockCipher>::BlockSize>;

/// OFB self-synchronizing stream cipher instance.
Expand All @@ -69,6 +77,22 @@ pub struct Ofb<C: BlockCipher> {
pos: usize,
}

#[cfg(cargo_feature = "zeroize")]
impl<C: Zeroize> Zeroize for Cfb8<C> {
fn zeroize(&mut self) {
self.cipher.zeroize();
self.block.zeroize();
self.pos.zeroize();
}
}

#[cfg(cargo_feature = "zeroize")]
impl<C> Drop for Cfb8<C> {
fn drop(&mut self) {
self.zeroize();
}
}

impl<C: BlockCipher> NewStreamCipher for Ofb<C> {
type KeySize = C::KeySize;
type NonceSize = C::BlockSize;
Expand Down Expand Up @@ -131,4 +155,3 @@ fn xor(buf1: &mut [u8], buf2: &[u8]) {
*a ^= *b;
}
}