diff --git a/Cargo.lock b/Cargo.lock index cf15f474..ac43acfa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -31,8 +31,9 @@ dependencies = [ [[package]] name = "blobby" -version = "0.4.0-pre.0" -source = "git+https://github.com/RustCrypto/utils#8fd37074861e2d8e400a53d68e10ce713944fa65" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89af0b093cc13baa4e51e64e65ec2422f7e73aea0e612e5ad3872986671622f1" [[package]] name = "block-buffer" @@ -90,8 +91,9 @@ checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" [[package]] name = "cipher" -version = "0.5.0-rc.1" -source = "git+https://github.com/RustCrypto/traits#e0b946691a9af9c875045c554317bcb9726ad370" +version = "0.5.0-rc.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "155e4a260750fa4f7754649f049748aacc31db238a358d85fd721002f230f92f" dependencies = [ "blobby", "block-buffer", @@ -111,8 +113,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.2.0-rc.4" -source = "git+https://github.com/RustCrypto/traits#e0b946691a9af9c875045c554317bcb9726ad370" +version = "0.2.0-rc.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "919bd05924682a5480aec713596b9e2aabed3a0a6022fab6847f85a99e5f190a" dependencies = [ "hybrid-array", ] @@ -158,9 +161,9 @@ dependencies = [ [[package]] name = "inout" -version = "0.2.0-rc.6" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1603f76010ff924b616c8f44815a42eb10fb0b93d308b41deaa8da6d4251fd4b" +checksum = "c7357b6e7aa75618c7864ebd0634b115a7218b0615f4cb1df33ac3eca23943d4" dependencies = [ "hybrid-array", ] diff --git a/Cargo.toml b/Cargo.toml index d5b9eab8..675e575f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,10 +26,3 @@ members = [ [profile.dev] opt-level = 2 - -[patch.crates-io] -# https://github.com/RustCrypto/traits/pull/1998 -cipher = { git = "https://github.com/RustCrypto/traits" } -# https://github.com/RustCrypto/utils/pull/1187 -# https://github.com/RustCrypto/utils/pull/1207 -blobby = { git = "https://github.com/RustCrypto/utils" } diff --git a/aes/Cargo.toml b/aes/Cargo.toml index 2044cc71..a0ce515e 100644 --- a/aes/Cargo.toml +++ b/aes/Cargo.toml @@ -14,16 +14,14 @@ categories = ["cryptography", "no-std"] [dependencies] cfg-if = "1" -cipher = "0.5.0-rc.1" -zeroize = { version = "1.5.6", optional = true, default-features = false, features = [ - "aarch64", -] } +cipher = "0.5.0-rc.2" +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-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } hex-literal = "1" [features] diff --git a/aria/Cargo.toml b/aria/Cargo.toml index 1da70de2..b1a40ae7 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.1" +cipher = "0.5.0-rc.2" [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } hex-literal = "1" [features] diff --git a/belt-block/Cargo.toml b/belt-block/Cargo.toml index 25b701d5..43be4a28 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.1", optional = true } +cipher = { version = "0.5.0-rc.2", optional = true } [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } hex-literal = "1" [features] diff --git a/blowfish/Cargo.toml b/blowfish/Cargo.toml index e80c4d44..2edbfe84 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.1" +cipher = "0.5.0-rc.2" byteorder = { version = "1.1", default-features = false } [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } [features] bcrypt = [] diff --git a/camellia/Cargo.toml b/camellia/Cargo.toml index 4874b739..4113eba0 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.1" +cipher = "0.5.0-rc.2" [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/cast5/Cargo.toml b/cast5/Cargo.toml index 92657ec2..d7e8142a 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.1" +cipher = "0.5.0-rc.2" [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } hex-literal = "1" [features] diff --git a/cast6/Cargo.toml b/cast6/Cargo.toml index 485fcff9..c10a200f 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.1" +cipher = "0.5.0-rc.2" [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } hex-literal = "1" [features] diff --git a/des/Cargo.toml b/des/Cargo.toml index 6b573de2..041f30d7 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.1" +cipher = "0.5.0-rc.2" [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } hex-literal = "1" [features] diff --git a/gift/Cargo.toml b/gift/Cargo.toml index 6e1c58bd..ceab3034 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.1" +cipher = "0.5.0-rc.2" [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } hex-literal = "1" [features] diff --git a/idea/Cargo.toml b/idea/Cargo.toml index 9b55515d..dfa3c8cd 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.1" +cipher = "0.5.0-rc.2" [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/kuznyechik/Cargo.toml b/kuznyechik/Cargo.toml index ad4ffa34..e99deec4 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.1" +cipher = "0.5.0-rc.2" cfg-if = "1" [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } hex-literal = "1" [features] diff --git a/magma/Cargo.toml b/magma/Cargo.toml index 4784f516..41cb3d39 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.1" +cipher = "0.5.0-rc.2" [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } hex-literal = "1" [features] diff --git a/rc2/Cargo.toml b/rc2/Cargo.toml index da0dd6e8..6f3cbc69 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.1" +cipher = "0.5.0-rc.2" [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/rc5/Cargo.toml b/rc5/Cargo.toml index fb73f50f..3bfbde66 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.1" +cipher = "0.5.0-rc.2" [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } hex-literal = "1" [features] diff --git a/rc6/Cargo.toml b/rc6/Cargo.toml index b5971463..7ac95cca 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.1", features = ["zeroize"] } +cipher = { version = "0.5.0-rc.2", features = ["zeroize"] } [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } [features] zeroize = [] diff --git a/serpent/Cargo.toml b/serpent/Cargo.toml index 44cb740d..281deee6 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.1" +cipher = "0.5.0-rc.2" [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } [features] zeroize = ["cipher/zeroize"] diff --git a/sm4/Cargo.toml b/sm4/Cargo.toml index 8b092bd6..2a45a175 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.1" +cipher = "0.5.0-rc.2" [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } hex-literal = "1" [features] diff --git a/speck/Cargo.toml b/speck/Cargo.toml index 48484f6e..3ead43f8 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.1" +cipher = "0.5.0-rc.2" [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } hex-literal = "1" [features] diff --git a/threefish/Cargo.toml b/threefish/Cargo.toml index 90d445f6..33e87a92 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.1", optional = true } +cipher = { version = "0.5.0-rc.2", optional = true } zeroize = { version = "1.6", optional = true, default-features = false } [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } hex-literal = "1" [features] diff --git a/twofish/Cargo.toml b/twofish/Cargo.toml index 8f3c29af..512b3721 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.1" +cipher = "0.5.0-rc.2" [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } hex-literal = "1" [features] diff --git a/xtea/Cargo.toml b/xtea/Cargo.toml index 87d93939..84d3707a 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.1" +cipher = "0.5.0-rc.2" [dev-dependencies] -cipher = { version = "0.5.0-rc.1", features = ["dev"] } +cipher = { version = "0.5.0-rc.2", features = ["dev"] } [features] zeroize = ["cipher/zeroize"]