Skip to content

Commit

Permalink
Bump cipher to v0.5.0-pre.6 (#65)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tarcieri
tarcieri authored Jul 27, 2024
1 parent 3c5a65c commit 6bbd3f8
Show file tree
Hide file tree
Showing 14 changed files with 54 additions and 54 deletions.
40 changes: 22 additions & 18 deletions Cargo.lock
View file

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

8 changes: 0 additions & 8 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,3 @@ members = [
"ofb",
"pcbc",
]

[patch.crates-io]
# please re-enable the minimal-versions when you remove those patches.
# https://github.com/RustCrypto/block-ciphers/pull/413
aes = { git = "https://github.com/RustCrypto/block-ciphers.git" }
belt-block = { git = "https://github.com/RustCrypto/block-ciphers.git" }
kuznyechik = { git = "https://github.com/RustCrypto/block-ciphers.git" }
magma = { git = "https://github.com/RustCrypto/block-ciphers.git" }
8 changes: 4 additions & 4 deletions belt-ctr/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ keywords = ["crypto", "block-mode", "stream-cipher", "ciphers", "belt"]
categories = ["cryptography", "no-std"]

[dependencies]
cipher = "=0.5.0-pre.4"
belt-block = "=0.2.0-pre.0"
cipher = "=0.5.0-pre.6"
belt-block = "=0.2.0-pre.1"

[dev-dependencies]
hex-literal = "0.4"
belt-block = "=0.2.0-pre.0"
cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
belt-block = "=0.2.0-pre.1"
cipher = { version = "=0.5.0-pre.6", features = ["dev"] }

[features]
alloc = ["cipher/alloc"]
Expand Down
6 changes: 3 additions & 3 deletions cbc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ keywords = ["crypto", "block-mode", "ciphers"]
categories = ["cryptography", "no-std"]

[dependencies]
cipher = "=0.5.0-pre.4"
cipher = "=0.5.0-pre.6"

[dev-dependencies]
aes = "=0.9.0-pre.0"
cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
aes = "=0.9.0-pre.1"
cipher = { version = "=0.5.0-pre.6", features = ["dev"] }
hex-literal = "0.4"

[features]
Expand Down
8 changes: 4 additions & 4 deletions cfb-mode/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ keywords = ["crypto", "block-mode", "stream-cipher", "ciphers"]
categories = ["cryptography", "no-std"]

[dependencies]
cipher = "=0.5.0-pre.4"
cipher = "=0.5.0-pre.6"

[dev-dependencies]
aes = "=0.9.0-pre.0"
belt-block = "=0.2.0-pre.0"
cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
aes = "=0.9.0-pre.1"
belt-block = "=0.2.0-pre.1"
cipher = { version = "=0.5.0-pre.6", features = ["dev"] }
hex-literal = "0.4"

[features]
Expand Down
6 changes: 3 additions & 3 deletions cfb8/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ keywords = ["crypto", "block-mode", "stream-cipher", "ciphers"]
categories = ["cryptography", "no-std"]

[dependencies]
cipher = "=0.5.0-pre.4"
cipher = "=0.5.0-pre.6"

[dev-dependencies]
aes = "=0.9.0-pre.0"
cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
aes = "=0.9.0-pre.1"
cipher = { version = "=0.5.0-pre.6", features = ["dev"] }
hex-literal = "0.4"

[features]
Expand Down
1 change: 1 addition & 0 deletions cfb8/src/decrypt.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ where
let mut t = self.iv.clone();
self.backend.proc_block((&mut t).into());
let r = block.get(0).clone_in();
#[allow(deprecated)]
block.xor_in2out(Array::from_slice(&t[..1]));
let n = self.iv.len();
for i in 0..n - 1 {
Expand Down
1 change: 1 addition & 0 deletions cfb8/src/encrypt.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ where
fn proc_block(&mut self, mut block: InOut<'_, '_, Block<Self>>) {
let mut t = self.iv.clone();
self.backend.proc_block((&mut t).into());
#[allow(deprecated)]
block.xor_in2out(Array::from_slice(&t[..1]));
let r = block.get_out()[0];
let n = self.iv.len();
Expand Down
10 changes: 5 additions & 5 deletions ctr/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ keywords = ["crypto", "block-mode", "stream-cipher", "ciphers"]
categories = ["cryptography", "no-std"]

[dependencies]
cipher = "=0.5.0-pre.4"
cipher = "=0.5.0-pre.6"

[dev-dependencies]
aes = "=0.9.0-pre.0"
magma = "=0.10.0-pre.0"
kuznyechik = "=0.9.0-pre.0"
cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
aes = "=0.9.0-pre.1"
magma = "=0.10.0-pre.1"
kuznyechik = "=0.9.0-pre.1"
cipher = { version = "=0.5.0-pre.6", features = ["dev"] }
hex-literal = "0.4"

[features]
Expand Down
6 changes: 3 additions & 3 deletions ige/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ keywords = ["crypto", "block-mode", "ciphers"]
categories = ["cryptography", "no-std"]

[dependencies]
cipher = "=0.5.0-pre.4"
cipher = "=0.5.0-pre.6"

[dev-dependencies]
aes = "=0.9.0-pre.0"
cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
aes = "=0.9.0-pre.1"
cipher = { version = "=0.5.0-pre.6", features = ["dev"] }
hex-literal = "0.4"

[features]
Expand Down
1 change: 1 addition & 0 deletions ige/src/decrypt.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ where
IgeIvSize<C>: ArraySize,
{
#[inline]
#[allow(deprecated)] // clone_from_slice
fn inner_iv_init(cipher: C, iv: &Iv<Self>) -> Self {
let (y, x) = iv.split_at(C::BlockSize::to_usize());
Self {
Expand Down
1 change: 1 addition & 0 deletions ige/src/encrypt.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ where
#[inline]
fn inner_iv_init(cipher: C, iv: &Iv<Self>) -> Self {
let (y, x) = iv.split_at(C::BlockSize::to_usize());
#[allow(deprecated)] // clone_from_slice
Self {
cipher,
x: Array::clone_from_slice(x),
Expand Down
6 changes: 3 additions & 3 deletions ofb/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ keywords = ["crypto", "block-mode", "stream-cipher", "ciphers"]
categories = ["cryptography", "no-std"]

[dependencies]
cipher = "=0.5.0-pre.4"
cipher = "=0.5.0-pre.6"

[dev-dependencies]
aes = "=0.9.0-pre.0"
cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
aes = "=0.9.0-pre.1"
cipher = { version = "=0.5.0-pre.6", features = ["dev"] }
hex-literal = "0.4"

[features]
Expand Down
6 changes: 3 additions & 3 deletions pcbc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ keywords = ["crypto", "block-mode", "ciphers"]
categories = ["cryptography", "no-std"]

[dependencies]
cipher = "=0.5.0-pre.4"
cipher = "=0.5.0-pre.6"

[dev-dependencies]
aes = "=0.9.0-pre.0"
cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
aes = "=0.9.0-pre.1"
cipher = { version = "=0.5.0-pre.6", features = ["dev"] }
hex-literal = "0.4"

[features]
Expand Down

0 comments on commit 6bbd3f8

Please sign in to comment.