Skip to content

Commit

Permalink
Enable aes dev-dependencies (#207)
Browse files Browse the repository at this point in the history
This commit completes working through upgrading the `cipher` crate with
circular dependencies between `aes` and `ctr`.

Now that RustCrypto/block-ciphers#217 it's possible to complete the
`cipher` crate upgrade started in #205.

All tests are now passing again.
  • Loading branch information
tarcieri committed Dec 30, 2020
1 parent 8891899 commit c40cf4c
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 16 deletions.
38 changes: 27 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cfb-mode/Cargo.toml
Expand Up @@ -15,6 +15,6 @@ edition = "2018"
cipher = "0.3.0-pre.3"

[dev-dependencies]
#aes = "0.7.0-pre"
aes = "0.7.0-pre"
cipher = { version = "0.3.0-pre.3", features = ["dev"] }
hex-literal = "0.2"
2 changes: 1 addition & 1 deletion cfb-mode/src/lib.rs
Expand Up @@ -10,7 +10,7 @@
//! ```
//! use aes::Aes128;
//! use cfb_mode::Cfb;
//! use cfb_mode::cipher::{NewCipher, StreamCipher};
//! use cfb_mode::cipher::{NewCipher, AsyncStreamCipher};
//! use hex_literal::hex;
//!
//! type AesCfb = Cfb<Aes128>;
Expand Down
2 changes: 1 addition & 1 deletion cfb8/Cargo.toml
Expand Up @@ -15,6 +15,6 @@ edition = "2018"
cipher = "=0.3.0-pre.3"

[dev-dependencies]
#aes = "=0.7.0-pre"
aes = "=0.7.0-pre"
cipher = { version = "=0.3.0-pre.3", features = ["dev"] }
hex-literal = "0.2"
2 changes: 1 addition & 1 deletion ctr/Cargo.toml
Expand Up @@ -15,6 +15,6 @@ edition = "2018"
cipher = "=0.3.0-pre.3"

[dev-dependencies]
#aes = "=0.7.0-pre"
aes = "=0.7.0-pre"
cipher = { version = "=0.3.0-pre.3", features = ["dev"] }
hex-literal = "0.2"
2 changes: 1 addition & 1 deletion ofb/Cargo.toml
Expand Up @@ -15,6 +15,6 @@ edition = "2018"
cipher = "=0.3.0-pre.3"

[dev-dependencies]
#aes = "=0.7.0-pre"
aes = "=0.7.0-pre"
cipher = { version = "=0.3.0-pre.3", features = ["dev"] }
hex-literal = "0.2"

0 comments on commit c40cf4c

Please sign in to comment.