From 6703a714406db0342457d64fd8af2ad5e3df1f5a Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Fri, 26 Jul 2024 12:18:51 -0600 Subject: [PATCH] Bump `ctr` to v0.10.0-pre.0 crate release (#615) --- Cargo.lock | 5 +++-- Cargo.toml | 10 +++------- aes-gcm-siv/Cargo.toml | 14 +++++++------- aes-gcm/Cargo.toml | 2 +- aes-siv/Cargo.toml | 4 ++-- ccm/Cargo.toml | 4 ++-- eax/Cargo.toml | 4 ++-- ocb3/Cargo.toml | 14 +++++++------- 8 files changed, 27 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c9e6333b..d6b0f5fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -208,8 +208,9 @@ dependencies = [ [[package]] name = "ctr" -version = "0.10.0-pre" -source = "git+https://github.com/RustCrypto/block-modes.git#532a46166bcc74bf718ca351cc3b5a86a2fcb2a3" +version = "0.10.0-pre.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36d153f259d848d742d829e332f32466d415e2b9dc247c0ea471e68da953f5e1" dependencies = [ "cipher", ] diff --git a/Cargo.toml b/Cargo.toml index dfbd126b..81462d25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,13 +13,9 @@ members = [ resolver = "2" [patch.crates-io] - -# https://github.com/RustCrypto/block-modes/pull/56 -ctr = { git = "https://github.com/RustCrypto/block-modes.git" } - # https://github.com/RustCrypto/MACs/pull/158 -cmac = { git = "https://github.com/RustCrypto/MACs.git" } -pmac = { git = "https://github.com/RustCrypto/MACs.git" } +cmac = { git = "https://github.com/RustCrypto/MACs.git" } +pmac = { git = "https://github.com/RustCrypto/MACs.git" } # https://github.com/RustCrypto/stream-ciphers/pull/345 -chacha20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" } +chacha20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" } diff --git a/aes-gcm-siv/Cargo.toml b/aes-gcm-siv/Cargo.toml index 79879b4a..f83eed11 100644 --- a/aes-gcm-siv/Cargo.toml +++ b/aes-gcm-siv/Cargo.toml @@ -20,7 +20,7 @@ rust-version = "1.65" aead = { version = "=0.6.0-pre.0", default-features = false } aes = { version = "=0.9.0-pre", optional = true } cipher = "=0.5.0-pre.4" -ctr = "=0.10.0-pre" +ctr = "=0.10.0-pre.0" polyval = { version = "=0.7.0-pre.0", default-features = false } subtle = { version = "2", default-features = false } zeroize = { version = "1", default-features = false } @@ -29,14 +29,14 @@ zeroize = { version = "1", default-features = false } aead = { version = "=0.6.0-pre.0", features = ["dev"], default-features = false } [features] -default = ["aes", "alloc", "getrandom"] -std = ["aead/std", "alloc"] -alloc = ["aead/alloc"] -arrayvec = ["aead/arrayvec"] +default = ["aes", "alloc", "getrandom"] +std = ["aead/std", "alloc"] +alloc = ["aead/alloc"] +arrayvec = ["aead/arrayvec"] getrandom = ["aead/getrandom", "rand_core"] -heapless = ["aead/heapless"] +heapless = ["aead/heapless"] rand_core = ["aead/rand_core"] -stream = ["aead/stream"] +stream = ["aead/stream"] [package.metadata.docs.rs] all-features = true diff --git a/aes-gcm/Cargo.toml b/aes-gcm/Cargo.toml index 7f8442d9..15b94113 100644 --- a/aes-gcm/Cargo.toml +++ b/aes-gcm/Cargo.toml @@ -20,7 +20,7 @@ rust-version = "1.65" aead = { version = "=0.6.0-pre.0", default-features = false } aes = { version = "=0.9.0-pre", optional = true } cipher = "=0.5.0-pre.4" -ctr = "=0.10.0-pre" +ctr = "=0.10.0-pre.0" ghash = { version = "=0.6.0-pre.0", default-features = false } subtle = { version = "2", default-features = false } zeroize = { version = "1", optional = true, default-features = false } diff --git a/aes-siv/Cargo.toml b/aes-siv/Cargo.toml index f0d6ca6a..2f4d38c7 100644 --- a/aes-siv/Cargo.toml +++ b/aes-siv/Cargo.toml @@ -21,7 +21,7 @@ aead = "=0.6.0-pre.0" aes = "=0.9.0-pre" cipher = "=0.5.0-pre.4" cmac = "0.8.0-pre" -ctr = "=0.10.0-pre" +ctr = "=0.10.0-pre.0" dbl = "0.4.0-pre.4" digest = { version = "0.11.0-pre.8", features = ["mac"] } zeroize = { version = "1", default-features = false } @@ -38,7 +38,7 @@ default = ["alloc", "getrandom"] std = ["aead/std", "alloc"] alloc = ["aead/alloc"] arrayvec = ["aead/arrayvec"] -getrandom = ["aead/getrandom", "rand_core"] +getrandom = ["aead/getrandom", "rand_core"] heapless = ["aead/heapless"] rand_core = ["aead/rand_core"] stream = ["aead/stream"] diff --git a/ccm/Cargo.toml b/ccm/Cargo.toml index eebf0e38..cbb15fb2 100644 --- a/ccm/Cargo.toml +++ b/ccm/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.65" [dependencies] aead = { version = "=0.6.0-pre.0", default-features = false } cipher = { version = "=0.5.0-pre.4", default-features = false } -ctr = { version = "=0.10.0-pre", default-features = false } +ctr = { version = "=0.10.0-pre.0", default-features = false } subtle = { version = "2", default-features = false } [dev-dependencies] @@ -29,7 +29,7 @@ default = ["alloc", "getrandom"] std = ["aead/std", "alloc"] alloc = ["aead/alloc"] arrayvec = ["aead/arrayvec"] -getrandom = ["aead/getrandom", "rand_core"] +getrandom = ["aead/getrandom", "rand_core"] heapless = ["aead/heapless"] rand_core = ["aead/rand_core"] stream = ["aead/stream"] diff --git a/eax/Cargo.toml b/eax/Cargo.toml index 8f408089..2dafc195 100644 --- a/eax/Cargo.toml +++ b/eax/Cargo.toml @@ -23,7 +23,7 @@ rust-version = "1.71" aead = { version = "=0.6.0-pre.0", default-features = false } cipher = "=0.5.0-pre.4" cmac = "=0.8.0-pre" -ctr = "=0.10.0-pre" +ctr = "=0.10.0-pre.0" subtle = { version = "2", default-features = false } [dev-dependencies] @@ -35,7 +35,7 @@ default = ["alloc", "getrandom"] std = ["aead/std", "alloc"] alloc = ["aead/alloc"] arrayvec = ["aead/arrayvec"] -getrandom = ["aead/getrandom", "rand_core"] +getrandom = ["aead/getrandom", "rand_core"] heapless = ["aead/heapless"] rand_core = ["aead/rand_core"] stream = ["aead/stream"] diff --git a/ocb3/Cargo.toml b/ocb3/Cargo.toml index 124477d0..71b434f1 100644 --- a/ocb3/Cargo.toml +++ b/ocb3/Cargo.toml @@ -18,7 +18,7 @@ rust-version = "1.72" [dependencies] aead = { version = "=0.6.0-pre.0", default-features = false } cipher = "=0.5.0-pre.4" -ctr = "=0.10.0-pre" +ctr = "=0.10.0-pre.0" dbl = "=0.4.0-pre.4" subtle = { version = "2", default-features = false } zeroize = { version = "1", optional = true, default-features = false } @@ -29,14 +29,14 @@ aes = { version = "=0.9.0-pre", default-features = false } hex-literal = "0.4" [features] -default = ["alloc", "getrandom"] -std = ["aead/std", "alloc"] -alloc = ["aead/alloc"] -arrayvec = ["aead/arrayvec"] +default = ["alloc", "getrandom"] +std = ["aead/std", "alloc"] +alloc = ["aead/alloc"] +arrayvec = ["aead/arrayvec"] getrandom = ["aead/getrandom", "rand_core"] -heapless = ["aead/heapless"] +heapless = ["aead/heapless"] rand_core = ["aead/rand_core"] -stream = ["aead/stream"] +stream = ["aead/stream"] [package.metadata.docs.rs] all-features = true