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

Upgrade to opaque-debug 0.3 #140

Merged
merged 1 commit into from
Jul 21, 2020
Merged

Upgrade to opaque-debug 0.3 #140

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 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.

2 changes: 1 addition & 1 deletion aes/aes-soft/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ categories = ["cryptography", "no-std"]

[dependencies]
block-cipher = "0.8"
opaque-debug = "0.2"
opaque-debug = "0.3"
byteorder = { version = "1", default-features = false }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion aes/aes-soft/src/impls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ macro_rules! define_aes_impl {
}
}

impl_opaque_debug!($name);
opaque_debug::implement!($name);
}
}

Expand Down
3 changes: 0 additions & 3 deletions aes/aes-soft/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@

pub use block_cipher;

#[macro_use]
extern crate opaque_debug;

mod bitslice;
mod consts;
mod expand;
Expand Down
2 changes: 1 addition & 1 deletion aes/aesni/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ categories = ["cryptography", "no-std"]

[dependencies]
block-cipher = "0.8"
opaque-debug = "0.2"
opaque-debug = "0.3"
stream-cipher = { version = "0.6", optional = true, features = ["block-cipher"] }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion aes/aesni/src/aes128.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,4 @@ impl BlockCipher for Aes128 {
}
}

impl_opaque_debug!(Aes128);
opaque_debug::implement!(Aes128);
2 changes: 1 addition & 1 deletion aes/aesni/src/aes192.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,4 @@ impl BlockCipher for Aes192 {
}
}

impl_opaque_debug!(Aes192);
opaque_debug::implement!(Aes192);
2 changes: 1 addition & 1 deletion aes/aesni/src/aes256.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,4 @@ impl BlockCipher for Aes256 {
}
}

impl_opaque_debug!(Aes256);
opaque_debug::implement!(Aes256);
2 changes: 1 addition & 1 deletion aes/aesni/src/ctr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ macro_rules! impl_ctr {
}
}

impl_opaque_debug!($name);
opaque_debug::implement!($name);
}
}

Expand Down
3 changes: 0 additions & 3 deletions aes/aesni/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@
#![doc(html_logo_url = "https://raw.githubusercontent.com/RustCrypto/meta/master/logo_small.png")]
#![warn(missing_docs, rust_2018_idioms)]

#[macro_use]
extern crate opaque_debug;

pub use block_cipher;

#[cfg(feature = "ctr")]
Expand Down
2 changes: 1 addition & 1 deletion blowfish/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ categories = ["cryptography", "no-std"]
[dependencies]
block-cipher = "0.8"
byteorder = { version = "1", default-features = false }
opaque-debug = "0.2"
opaque-debug = "0.3"

[dev-dependencies]
block-cipher = { version = "0.8", features = ["dev"] }
Expand Down
5 changes: 1 addition & 4 deletions blowfish/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
#![forbid(unsafe_code)]
#![warn(missing_docs, rust_2018_idioms)]

#[macro_use]
extern crate opaque_debug;

pub use block_cipher;

use block_cipher::consts::{U1, U56, U8};
Expand Down Expand Up @@ -202,4 +199,4 @@ impl Blowfish<BE> {
}
}

impl_opaque_debug!(Blowfish);
opaque_debug::implement!(Blowfish);
2 changes: 1 addition & 1 deletion cast5/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ categories = ["cryptography", "no-std"]

[dependencies]
block-cipher = "0.8"
opaque-debug = "0.2"
opaque-debug = "0.3"
byteorder = { version = "1", default-features = false }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion cast5/src/cast5.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,4 @@ impl BlockCipher for Cast5 {
}
}

impl_opaque_debug!(Cast5);
opaque_debug::implement!(Cast5);
3 changes: 0 additions & 3 deletions cast5/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
#![forbid(unsafe_code)]
#![warn(missing_docs, rust_2018_idioms)]

#[macro_use]
extern crate opaque_debug;

pub use block_cipher::{self, BlockCipher};

mod cast5;
Expand Down
2 changes: 1 addition & 1 deletion des/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ categories = ["cryptography", "no-std"]
[dependencies]
block-cipher = "0.8"
byteorder = { version = "1", default-features = false }
opaque-debug = "0.2"
opaque-debug = "0.3"

[dev-dependencies]
block-cipher = { version = "0.8", features = ["dev"] }
2 changes: 1 addition & 1 deletion des/src/des.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,4 @@ impl BlockCipher for Des {
}
}

impl_opaque_debug!(Des);
opaque_debug::implement!(Des);
3 changes: 0 additions & 3 deletions des/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
#![forbid(unsafe_code)]
#![warn(missing_docs, rust_2018_idioms)]

#[macro_use]
extern crate opaque_debug;

pub use block_cipher;

mod consts;
Expand Down
8 changes: 4 additions & 4 deletions des/src/tdes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ impl BlockCipher for TdesEee2 {
}
}

impl_opaque_debug!(TdesEde3);
impl_opaque_debug!(TdesEee3);
impl_opaque_debug!(TdesEde2);
impl_opaque_debug!(TdesEee2);
opaque_debug::implement!(TdesEde3);
opaque_debug::implement!(TdesEee3);
opaque_debug::implement!(TdesEde2);
opaque_debug::implement!(TdesEee2);
2 changes: 1 addition & 1 deletion idea/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ categories = ["cryptography", "no-std"]

[dependencies]
block-cipher = "0.8"
opaque-debug = "0.2"
opaque-debug = "0.3"

[dev-dependencies]
block-cipher = { version = "0.8", features = ["dev"] }
Expand Down
5 changes: 1 addition & 4 deletions idea/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
#![warn(missing_docs, rust_2018_idioms)]
#![allow(clippy::many_single_char_names)]

#[macro_use]
extern crate opaque_debug;

pub use block_cipher;

use block_cipher::consts::{U1, U16, U8};
Expand Down Expand Up @@ -194,7 +191,7 @@ impl BlockCipher for Idea {
}
}

impl_opaque_debug!(Idea);
opaque_debug::implement!(Idea);

#[cfg(test)]
mod tests;
2 changes: 1 addition & 1 deletion kuznyechik/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ categories = ["cryptography", "no-std"]

[dependencies]
block-cipher = "0.8"
opaque-debug = "0.2"
opaque-debug = "0.3"

[dev-dependencies]
block-cipher = { version = "0.8", features = ["dev"] }
Expand Down
5 changes: 1 addition & 4 deletions kuznyechik/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
#![warn(missing_docs, rust_2018_idioms)]
#![allow(clippy::needless_range_loop, clippy::transmute_ptr_to_ptr)]

#[macro_use]
extern crate opaque_debug;

pub use block_cipher;

use block_cipher::consts::{U1, U16, U32};
Expand Down Expand Up @@ -167,4 +164,4 @@ impl BlockCipher for Kuznyechik {
}
}

impl_opaque_debug!(Kuznyechik);
opaque_debug::implement!(Kuznyechik);
2 changes: 1 addition & 1 deletion magma/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ categories = ["cryptography", "no-std"]
[dependencies]
byteorder = { version = "1", default-features = false }
block-cipher = "0.8"
opaque-debug = "0.2"
opaque-debug = "0.3"

[dev-dependencies]
block-cipher = { version = "0.8", features = ["dev"] }
Expand Down
2 changes: 1 addition & 1 deletion magma/src/construct.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ macro_rules! construct_cipher {
}
}

impl_opaque_debug!($name);
opaque_debug::implement!($name);
};
}
3 changes: 0 additions & 3 deletions magma/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
#![deny(unsafe_code)]
#![warn(rust_2018_idioms)]

#[macro_use]
extern crate opaque_debug;

mod sboxes_exp;
#[macro_use]
mod construct;
Expand Down
2 changes: 1 addition & 1 deletion rc2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ categories = ["cryptography", "no-std"]

[dependencies]
block-cipher = "0.8"
opaque-debug = "0.2"
opaque-debug = "0.3"

[dev-dependencies]
block-cipher = { version = "0.8", features = ["dev"] }
5 changes: 1 addition & 4 deletions rc2/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
#![forbid(unsafe_code)]
#![warn(rust_2018_idioms)]

#[macro_use]
extern crate opaque_debug;

pub use block_cipher;

use block_cipher::consts::{U1, U32, U8};
Expand Down Expand Up @@ -221,4 +218,4 @@ impl BlockCipher for Rc2 {
}
}

impl_opaque_debug!(Rc2);
opaque_debug::implement!(Rc2);
2 changes: 1 addition & 1 deletion serpent/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ categories = ["cryptography", "no-std"]
[dependencies]
byteorder = { version = "1", default-features = false }
block-cipher = "0.8"
opaque-debug = "0.2"
opaque-debug = "0.3"

[dev-dependencies]
block-cipher = { version = "0.8", features = ["dev"] }
Expand Down
5 changes: 1 addition & 4 deletions serpent/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
#![warn(missing_docs, rust_2018_idioms)]
#![allow(clippy::needless_range_loop)]

#[macro_use]
extern crate opaque_debug;

pub use block_cipher;

use block_cipher::consts::{U1, U16};
Expand Down Expand Up @@ -282,4 +279,4 @@ impl BlockCipher for Serpent {
}
}

impl_opaque_debug!(Serpent);
opaque_debug::implement!(Serpent);
2 changes: 1 addition & 1 deletion sm4/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ categories = ["cryptography"]
[dependencies]
block-cipher = "0.8"
byteorder = { version = "1", default-features = false }
opaque-debug = "0.2"
opaque-debug = "0.3"

[dev-dependencies]
block-cipher = { version = "0.8", features = ["dev"] }
Expand Down
2 changes: 1 addition & 1 deletion twofish/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ categories = ["cryptography", "no-std"]
[dependencies]
byteorder = { version = "1", default-features = false }
block-cipher = "0.8"
opaque-debug = "0.2"
opaque-debug = "0.3"

[dev-dependencies]
block-cipher = { version = "0.8", features = ["dev"] }
Expand Down
5 changes: 1 addition & 4 deletions twofish/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
#![warn(missing_docs, rust_2018_idioms)]
#![allow(clippy::needless_range_loop, clippy::unreadable_literal)]

#[macro_use]
extern crate opaque_debug;

pub use block_cipher;

use block_cipher::consts::{U1, U16, U32};
Expand Down Expand Up @@ -249,7 +246,7 @@ impl BlockCipher for Twofish {
}
}

impl_opaque_debug!(Twofish);
opaque_debug::implement!(Twofish);

#[cfg(test)]
mod tests;