From da25e2bd2cbf8d8fd04c4f99f07ba169d3b1756a Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Mon, 19 Feb 2024 20:30:01 -0800 Subject: [PATCH] relax and bump `cipher` dependency to `0.5.0-pre.4` --- Cargo.lock | 13 +++++++------ Cargo.toml | 3 --- aes/Cargo.toml | 4 ++-- aria/Cargo.toml | 4 ++-- belt-block/Cargo.toml | 4 ++-- blowfish/Cargo.toml | 4 ++-- camellia/Cargo.toml | 4 ++-- cast5/Cargo.toml | 4 ++-- cast6/Cargo.toml | 4 ++-- des/Cargo.toml | 4 ++-- idea/Cargo.toml | 4 ++-- kuznyechik/Cargo.toml | 4 ++-- magma/Cargo.toml | 4 ++-- rc2/Cargo.toml | 4 ++-- rc5/Cargo.toml | 4 ++-- serpent/Cargo.toml | 4 ++-- sm4/Cargo.toml | 4 ++-- speck/Cargo.toml | 4 ++-- threefish/Cargo.toml | 4 ++-- twofish/Cargo.toml | 4 ++-- 20 files changed, 43 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 96dff53b..bd8023c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -81,8 +81,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cipher" -version = "0.5.0-pre.2" -source = "git+https://github.com/RustCrypto/traits.git#4459f6012afda093816e6a592828a57a8fc366ed" +version = "0.5.0-pre.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84fba98785cecd0e308818a87c817576a40f99d8bab6405bf422bacd3efb6c1f" dependencies = [ "blobby", "crypto-common", @@ -101,9 +102,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.2.0-pre.4" +version = "0.2.0-pre.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806e4e3731d44f1340b069551225b44c2056c105cad9e67f0c46266db8a3a6b9" +checksum = "b7aa2ec04f5120b830272a481e8d9d8ba4dda140d2cda59b0f1110d5eb93c38e" dependencies = [ "hybrid-array", ] @@ -129,9 +130,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "hybrid-array" -version = "0.2.0-rc.3" +version = "0.2.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8856b3db5eb76328f03589feb25c7a3166bfa0ae3b38b1408d546b097fa7947" +checksum = "dcda354500b318c287a6b91c1cfbc42edd53d52d259a80783ceb5e3986fca2b2" dependencies = [ "typenum", ] diff --git a/Cargo.toml b/Cargo.toml index fe9857dd..16736539 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,6 +23,3 @@ members = [ [profile.dev] opt-level = 2 - -[patch.crates-io.cipher] -git = "https://github.com/RustCrypto/traits.git" diff --git a/aes/Cargo.toml b/aes/Cargo.toml index ff892e84..c6032815 100644 --- a/aes/Cargo.toml +++ b/aes/Cargo.toml @@ -14,14 +14,14 @@ categories = ["cryptography", "no-std"] [dependencies] cfg-if = "1" -cipher = "=0.5.0-pre.2" +cipher = "0.5.0-pre.4" zeroize = { version = "1.5.6", optional = true, default_features = false, features = ["aarch64"] } [target.'cfg(any(target_arch = "aarch64", target_arch = "x86_64", target_arch = "x86"))'.dependencies] cpufeatures = "0.2" [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"] } +cipher = { version = "0.5.0-pre.4", features = ["dev"] } hex-literal = "0.3" [features] diff --git a/aria/Cargo.toml b/aria/Cargo.toml index 5cf440bb..b19f2642 100644 --- a/aria/Cargo.toml +++ b/aria/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "aria", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.2" +cipher = "0.5.0-pre.4" [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"] } +cipher = { version = "0.5.0-pre.4", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/belt-block/Cargo.toml b/belt-block/Cargo.toml index 5fce3a53..30509a1d 100644 --- a/belt-block/Cargo.toml +++ b/belt-block/Cargo.toml @@ -12,10 +12,10 @@ repository = "https://github.com/RustCrypto/block-ciphers" keywords = ["crypto", "belt-block", "belt", "stb"] [dependencies] -cipher = { version = "=0.5.0-pre.2", optional = true } +cipher = { version = "0.5.0-pre.4", optional = true } [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"] } +cipher = { version = "0.5.0-pre.4", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/blowfish/Cargo.toml b/blowfish/Cargo.toml index d4582295..5d837f66 100644 --- a/blowfish/Cargo.toml +++ b/blowfish/Cargo.toml @@ -13,11 +13,11 @@ keywords = ["crypto", "blowfish", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.2" +cipher = "0.5.0-pre.4" byteorder = { version = "1.1", default-features = false } [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"] } +cipher = { version = "0.5.0-pre.4", features = ["dev"] } [features] bcrypt = [] diff --git a/camellia/Cargo.toml b/camellia/Cargo.toml index 1606bb4e..f785d0c0 100644 --- a/camellia/Cargo.toml +++ b/camellia/Cargo.toml @@ -14,10 +14,10 @@ categories = ["cryptography", "no-std"] [dependencies] byteorder = { version = "1.1", default-features = false } -cipher = "=0.5.0-pre.2" +cipher = "0.5.0-pre.4" [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"] } +cipher = { version = "0.5.0-pre.4", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/cast5/Cargo.toml b/cast5/Cargo.toml index f25ce04c..63062d7b 100644 --- a/cast5/Cargo.toml +++ b/cast5/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "cast5", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.2" +cipher = "0.5.0-pre.4" [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"] } +cipher = { version = "0.5.0-pre.4", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/cast6/Cargo.toml b/cast6/Cargo.toml index b824ea43..caad9f53 100644 --- a/cast6/Cargo.toml +++ b/cast6/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "cast6", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.2" +cipher = "0.5.0-pre.4" [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"] } +cipher = { version = "0.5.0-pre.4", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/des/Cargo.toml b/des/Cargo.toml index cc17697c..c86851c5 100644 --- a/des/Cargo.toml +++ b/des/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "des", "tdes", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.2" +cipher = "0.5.0-pre.4" [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"] } +cipher = { version = "0.5.0-pre.4", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/idea/Cargo.toml b/idea/Cargo.toml index 47a3417f..a8854f35 100644 --- a/idea/Cargo.toml +++ b/idea/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "idea", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.2" +cipher = "0.5.0-pre.4" [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"] } +cipher = { version = "0.5.0-pre.4", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/kuznyechik/Cargo.toml b/kuznyechik/Cargo.toml index 3962b449..d38f25d1 100644 --- a/kuznyechik/Cargo.toml +++ b/kuznyechik/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "kuznyechik", "gost", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.2" +cipher = "0.5.0-pre.4" [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"] } +cipher = { version = "0.5.0-pre.4", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/magma/Cargo.toml b/magma/Cargo.toml index 6abe9c32..c5548ac6 100644 --- a/magma/Cargo.toml +++ b/magma/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "magma", "gost", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.2" +cipher = "0.5.0-pre.4" [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"] } +cipher = { version = "0.5.0-pre.4", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/rc2/Cargo.toml b/rc2/Cargo.toml index 1896e148..adeabbc6 100644 --- a/rc2/Cargo.toml +++ b/rc2/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "rc2", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.2" +cipher = "0.5.0-pre.4" [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"] } +cipher = { version = "0.5.0-pre.4", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/rc5/Cargo.toml b/rc5/Cargo.toml index 74f6ef00..14a8ef6e 100644 --- a/rc5/Cargo.toml +++ b/rc5/Cargo.toml @@ -12,10 +12,10 @@ keywords = ["crypto", "rc5", "block-cipher"] categories = ["cryptography"] [dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["zeroize"] } +cipher = { version = "0.5.0-pre.4", features = ["zeroize"] } [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"] } +cipher = { version = "0.5.0-pre.4", features = ["dev"] } [features] zeroize = [] diff --git a/serpent/Cargo.toml b/serpent/Cargo.toml index 7757ad8a..1767d0b1 100644 --- a/serpent/Cargo.toml +++ b/serpent/Cargo.toml @@ -14,10 +14,10 @@ categories = ["cryptography", "no-std"] [dependencies] byteorder = { version = "1.1", default-features = false } -cipher = "=0.5.0-pre.2" +cipher = "0.5.0-pre.4" [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"] } +cipher = { version = "0.5.0-pre.4", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/sm4/Cargo.toml b/sm4/Cargo.toml index de8d4373..5fa192e4 100644 --- a/sm4/Cargo.toml +++ b/sm4/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "sm4", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.2" +cipher = "0.5.0-pre.4" [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"] } +cipher = { version = "0.5.0-pre.4", features = ["dev"] } hex-literal = "0.4" [features] diff --git a/speck/Cargo.toml b/speck/Cargo.toml index c914fac5..161e0693 100644 --- a/speck/Cargo.toml +++ b/speck/Cargo.toml @@ -13,8 +13,8 @@ keywords = ["crypto", "speck", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.2" +cipher = "0.5.0-pre.4" [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"] } +cipher = { version = "0.5.0-pre.4", features = ["dev"] } hex-literal = "0.4" diff --git a/threefish/Cargo.toml b/threefish/Cargo.toml index 388fbfbd..4c887853 100644 --- a/threefish/Cargo.toml +++ b/threefish/Cargo.toml @@ -13,11 +13,11 @@ keywords = ["crypto", "threefish", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = { version = "=0.5.0-pre.2", optional = true } +cipher = { version = "0.5.0-pre.4", optional = true } zeroize = { version = "1.6", optional = true, default-features = false } [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"]} +cipher = { version = "0.5.0-pre.4", features = ["dev"]} hex-literal = "0.4" [features] diff --git a/twofish/Cargo.toml b/twofish/Cargo.toml index cf001f79..c3b10051 100644 --- a/twofish/Cargo.toml +++ b/twofish/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "twofish", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "=0.5.0-pre.2" +cipher = "0.5.0-pre.4" [dev-dependencies] -cipher = { version = "=0.5.0-pre.2", features = ["dev"] } +cipher = { version = "0.5.0-pre.4", features = ["dev"] } hex-literal = "0.4" [features]