diff --git a/.typos.toml b/.typos.toml index 34eec239..135d8c3f 100644 --- a/.typos.toml +++ b/.typos.toml @@ -14,6 +14,8 @@ extend-ignore-re = [ ] [default.extend-words] +consts = "consts" +cpy = "cpy" "GOST" = "GOST" # encryption-decryption-encryption acronym in des "EDE" = "EDE" diff --git a/Cargo.lock b/Cargo.lock index 06f5d0f9..368ebcc2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 4 [[package]] name = "aes" -version = "0.9.0-rc.3" +version = "0.9.0-rc.4" dependencies = [ "cipher", "cpubits", @@ -91,9 +91,9 @@ checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" [[package]] name = "cipher" -version = "0.5.0-rc.7" +version = "0.5.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf7e48717e58fd82d6470086ab1c0e12f56426b4ef96c84bb84b9c3fefc6d9c7" +checksum = "9002c8edb9b1e21938663da3489c9c4403bba2393997fb2ecbd401386c0e71dc" dependencies = [ "blobby", "block-buffer", @@ -119,9 +119,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.2.0-rc.14" +version = "0.2.0-rc.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5569e5de27d32e673283717728eb5b0e4f30898b523f151a19c51e6188006599" +checksum = "6f8441110cea75afde0b89a8d796e2bc67b23432f5a9566cb15d9d365d91a2b0" dependencies = [ "hybrid-array", ] diff --git a/aes/Cargo.toml b/aes/Cargo.toml index 63c349c4..a51c4040 100644 --- a/aes/Cargo.toml +++ b/aes/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aes" -version = "0.9.0-rc.3" +version = "0.9.0-rc.4" description = "Pure Rust implementation of the Advanced Encryption Standard (a.k.a. Rijndael)" authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" @@ -13,7 +13,7 @@ keywords = ["crypto", "aes", "rijndael", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "0.5.0-rc.7" +cipher = "0.5.0-rc.8" cpubits = "0.1.0-rc.3" zeroize = { version = "1.5.6", optional = true, default-features = false, features = ["aarch64"] } @@ -21,7 +21,7 @@ zeroize = { version = "1.5.6", optional = true, default-features = false, featur cpufeatures = "0.2.12" [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/aria/Cargo.toml b/aria/Cargo.toml index bcf31c25..41c473b5 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-rc.7" +cipher = "0.5.0-rc.8" [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/belt-block/Cargo.toml b/belt-block/Cargo.toml index a53d32f9..922ca753 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-rc.7", optional = true } +cipher = { version = "0.5.0-rc.8", optional = true } [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/blowfish/Cargo.toml b/blowfish/Cargo.toml index e3ffd4e5..7f67960e 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-rc.7" +cipher = "0.5.0-rc.8" byteorder = { version = "1.1", default-features = false } [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } [features] bcrypt = [] diff --git a/camellia/Cargo.toml b/camellia/Cargo.toml index e1d53cc7..8f8ff536 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-rc.7" +cipher = "0.5.0-rc.8" [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/cast5/Cargo.toml b/cast5/Cargo.toml index 6bf7053f..01c5667a 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-rc.7" +cipher = "0.5.0-rc.8" [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/cast6/Cargo.toml b/cast6/Cargo.toml index f0b9f8ec..25971d90 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-rc.7" +cipher = "0.5.0-rc.8" [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/des/Cargo.toml b/des/Cargo.toml index d14aac9b..2cbb40cb 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-rc.7" +cipher = "0.5.0-rc.8" [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/gift/Cargo.toml b/gift/Cargo.toml index 617a3b90..69e61401 100644 --- a/gift/Cargo.toml +++ b/gift/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "gift", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "0.5.0-rc.7" +cipher = "0.5.0-rc.8" [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/idea/Cargo.toml b/idea/Cargo.toml index 2f1f55bb..64476cf8 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-rc.7" +cipher = "0.5.0-rc.8" [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/kuznyechik/Cargo.toml b/kuznyechik/Cargo.toml index 92a2338e..b9d5884b 100644 --- a/kuznyechik/Cargo.toml +++ b/kuznyechik/Cargo.toml @@ -13,11 +13,11 @@ keywords = ["crypto", "kuznyechik", "gost", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "0.5.0-rc.7" +cipher = "0.5.0-rc.8" cfg-if = "1" [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/magma/Cargo.toml b/magma/Cargo.toml index 430f5930..b796c0c9 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-rc.7" +cipher = "0.5.0-rc.8" [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/rc2/Cargo.toml b/rc2/Cargo.toml index 7662518d..4c717c37 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-rc.7" +cipher = "0.5.0-rc.8" [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/rc5/Cargo.toml b/rc5/Cargo.toml index 2d116f04..14dad1fc 100644 --- a/rc5/Cargo.toml +++ b/rc5/Cargo.toml @@ -12,10 +12,10 @@ keywords = ["crypto", "rc5", "block-cipher"] categories = ["cryptography"] [dependencies] -cipher = "0.5.0-rc.7" +cipher = "0.5.0-rc.8" [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/rc5/src/lib.rs b/rc5/src/lib.rs index c7835846..94338abe 100644 --- a/rc5/src/lib.rs +++ b/rc5/src/lib.rs @@ -23,8 +23,8 @@ use cipher::{ BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt, BlockSizeUser, KeyInit, KeySizeUser, ParBlocksSizeUser, array::ArraySize, + common::BlockSizes, consts::{U1, U2, U256}, - crypto_common::BlockSizes, inout::InOut, typenum::{Diff, IsLess, Le, NonZero, Sum, Unsigned}, }; diff --git a/rc5/src/primitives.rs b/rc5/src/primitives.rs index d3a49d11..459b62e4 100644 --- a/rc5/src/primitives.rs +++ b/rc5/src/primitives.rs @@ -2,7 +2,7 @@ use core::ops::{Add, BitXor, Mul}; use cipher::{ array::{Array, ArraySize}, - crypto_common::BlockSizes, + common::BlockSizes, typenum::{Diff, Prod, Quot, Sum, U1, U2, U4, U8, U16}, }; diff --git a/rc6/Cargo.toml b/rc6/Cargo.toml index 9465a167..e291fc09 100644 --- a/rc6/Cargo.toml +++ b/rc6/Cargo.toml @@ -12,10 +12,10 @@ keywords = ["crypto", "rc6", "block-cipher"] categories = ["cryptography"] [dependencies] -cipher = { version = "0.5.0-rc.7", features = ["zeroize"] } +cipher = { version = "0.5.0-rc.8", features = ["zeroize"] } [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } [features] zeroize = [] diff --git a/rc6/src/block_cipher.rs b/rc6/src/block_cipher.rs index 6f92430a..a3ad5efd 100644 --- a/rc6/src/block_cipher.rs +++ b/rc6/src/block_cipher.rs @@ -7,7 +7,7 @@ use cipher::{ BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt, BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt, }, - crypto_common::BlockSizes, + common::BlockSizes, inout::InOut, typenum::{Diff, IsLess, Le, NonZero, Sum, U1, U2, U4, U8, U12, U16, U20, U24, U256, Unsigned}, }; diff --git a/rc6/src/core/backend.rs b/rc6/src/core/backend.rs index 56b65fda..c9fe0784 100644 --- a/rc6/src/core/backend.rs +++ b/rc6/src/core/backend.rs @@ -6,7 +6,7 @@ use core::{ use cipher::{ array::{Array, ArraySize}, - crypto_common::BlockSizes, + common::BlockSizes, inout::InOut, typenum::{Diff, IsLess, Le, NonZero, Sum, U1, U2, U4, U256, Unsigned}, }; diff --git a/serpent/Cargo.toml b/serpent/Cargo.toml index b1dd6252..5624a3c4 100644 --- a/serpent/Cargo.toml +++ b/serpent/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "serpent", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "0.5.0-rc.7" +cipher = "0.5.0-rc.8" [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/sm4/Cargo.toml b/sm4/Cargo.toml index e1680e43..c2269f89 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-rc.7" +cipher = "0.5.0-rc.8" [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/speck/Cargo.toml b/speck/Cargo.toml index 9a03d3fa..22a934c3 100644 --- a/speck/Cargo.toml +++ b/speck/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "speck", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "0.5.0-rc.7" +cipher = "0.5.0-rc.8" [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/threefish/Cargo.toml b/threefish/Cargo.toml index 68c977f2..29220691 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-rc.7", optional = true } +cipher = { version = "0.5.0-rc.8", optional = true } zeroize = { version = "1.6", optional = true, default-features = false } [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/twofish/Cargo.toml b/twofish/Cargo.toml index 26cf97b4..6c04c6ba 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-rc.7" +cipher = "0.5.0-rc.8" [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } hex-literal = "1" [features] diff --git a/xtea/Cargo.toml b/xtea/Cargo.toml index ae7007fe..b1da76f2 100644 --- a/xtea/Cargo.toml +++ b/xtea/Cargo.toml @@ -13,10 +13,10 @@ keywords = ["crypto", "xtea", "block-cipher"] categories = ["cryptography", "no-std"] [dependencies] -cipher = "0.5.0-rc.7" +cipher = "0.5.0-rc.8" [dev-dependencies] -cipher = { version = "0.5.0-rc.7", features = ["dev"] } +cipher = { version = "0.5.0-rc.8", features = ["dev"] } [features] zeroize = ["cipher/zeroize"]