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

stream-cipher: remove NewBlockCipher bound on FromBlockCipher #333

Merged
merged 1 commit into from
Oct 14, 2020
Merged

stream-cipher: remove NewBlockCipher bound on FromBlockCipher #333

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.

4 changes: 2 additions & 2 deletions cryptography/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cryptography"
version = "0.4.1"
version = "0.5.0-pre"
authors = ["The RustCrypto Project Developers"]
license = "Apache-2.0 OR MIT"
description = "Facade crate for the RustCrypto project's traits"
Expand All @@ -18,7 +18,7 @@ digest = { version = "0.9", optional = true, path = "../digest" }
elliptic-curve = { version = "0.6", optional = true, path = "../elliptic-curve" }
mac = { version = "0.9", package = "crypto-mac", optional = true, path = "../crypto-mac" }
signature = { version = "1.2.0", optional = true, default-features = false, path = "../signature" }
stream-cipher = { version = "0.7", optional = true, path = "../stream-cipher" }
stream-cipher = { version = "0.8.0-pre", optional = true, path = "../stream-cipher" }
universal-hash = { version = "0.4", optional = true, path = "../universal-hash" }

[features]
Expand Down
2 changes: 1 addition & 1 deletion stream-cipher/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "stream-cipher"
description = "Stream cipher traits"
version = "0.7.1"
version = "0.8.0-pre"
authors = ["RustCrypto Developers"]
license = "MIT OR Apache-2.0"
readme = "README.md"
Expand Down
3 changes: 2 additions & 1 deletion stream-cipher/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ impl<C: SyncStreamCipher> SyncStreamCipher for &mut C {
#[cfg_attr(docsrs, doc(cfg(feature = "block-cipher")))]
pub trait FromBlockCipher {
/// Block cipher
type BlockCipher: BlockCipher + NewBlockCipher;
type BlockCipher: BlockCipher;
/// Nonce size in bytes
type NonceSize: ArrayLength<u8>;

Expand All @@ -188,6 +188,7 @@ pub trait FromBlockCipher {
impl<C> NewStreamCipher for C
where
C: FromBlockCipher,
C::BlockCipher: NewBlockCipher,
{
type KeySize = <<Self as FromBlockCipher>::BlockCipher as NewBlockCipher>::KeySize;
type NonceSize = <Self as FromBlockCipher>::NonceSize;
Expand Down