diff --git a/Cargo.lock b/Cargo.lock index fdd07cc5..6d5e14b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,8 +5,9 @@ version = 4 [[package]] name = "aead" -version = "0.6.0-rc.0" -source = "git+https://github.com/RustCrypto/traits.git#3620aba4f1e81e506b46a5f88c47f7ee3a7b87e0" +version = "0.6.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c01559752fbde7734af628961723aa734aa46351cbf5c9ce41133ad2ae1a09b9" dependencies = [ "arrayvec", "blobby 0.4.0-pre.0", @@ -25,9 +26,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.9.0-pre.3" +version = "0.9.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e4da00d9978020ddaa556c1747cfcafc3f375cfadb109acfe8b752cfc373bf" +checksum = "cd4838e4ad37bb032dea137f441d5f71c16c26c068af512e64c5bc13a88cdfc7" dependencies = [ "cfg-if", "cipher", @@ -56,7 +57,7 @@ dependencies = [ "aes", "cipher", "ctr", - "polyval 0.7.0-rc.0 (registry+https://github.com/rust-lang/crates.io-index)", + "polyval", "subtle", "zeroize", ] @@ -73,7 +74,7 @@ dependencies = [ "ctr", "dbl", "digest", - "hex-literal 0.4.1", + "hex-literal 1.0.0", "pmac", "zeroize", ] @@ -105,17 +106,18 @@ dependencies = [ [[package]] name = "belt-block" -version = "0.2.0-pre.3" +version = "0.2.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cce8d102fb5accb008983fb54f0975834bc5f7789080e6564b0f7e13ffe37a" +checksum = "b9aa0cd4ec3b89021a53caa73cefc5a458cf33b338498e1191916153877bd794" dependencies = [ "cipher", ] [[package]] name = "belt-ctr" -version = "0.2.0-pre" -source = "git+https://github.com/RustCrypto/block-modes.git#3ec1c8191dea30def40c033513bbc8bdb3a9cd78" +version = "0.2.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9e62741717c47d2f988623df3ee9265788c339255c2ca555133d4f6303bf5b8" dependencies = [ "belt-block", "cipher", @@ -194,8 +196,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chacha20" -version = "0.10.0-pre.3" -source = "git+https://github.com/RustCrypto/stream-ciphers.git#596cdebf250d7fe8921e18c7288964f50448ae1c" +version = "0.10.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e057d7ab0331b90074df7ca698b3361860c20a1d8c8e28f49c01f526e3f3958" dependencies = [ "cfg-if", "cipher", @@ -216,9 +219,9 @@ dependencies = [ [[package]] name = "cipher" -version = "0.5.0-pre.8" +version = "0.5.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276974d2acb7cf592603150941fc1ff6442acdeb1dc653ac2825928f4703c131" +checksum = "bd4ef774202f1749465fc7cf88d70fc30620e8cacd5429268f4bff7d003bd976" dependencies = [ "crypto-common", "inout", @@ -227,9 +230,9 @@ dependencies = [ [[package]] name = "cmac" -version = "0.8.0-pre.3" +version = "0.8.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5965a19674a22507a478bb9fc6db32b1a397cd0d91c4a7f8facc1b2547e9de54" +checksum = "14088e66e0ff42509343b570d1c9c641bb4ddb972c43e606157fb6c571c334f0" dependencies = [ "cipher", "dbl", @@ -247,8 +250,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.2.0-rc.2" -source = "git+https://github.com/RustCrypto/traits.git#3620aba4f1e81e506b46a5f88c47f7ee3a7b87e0" +version = "0.2.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a23fa214dea9efd4dacee5a5614646b30216ae0f05d4bb51bafb50e9da1c5be" dependencies = [ "hybrid-array", "rand_core", @@ -256,8 +260,9 @@ dependencies = [ [[package]] name = "ctr" -version = "0.10.0-pre.2" -source = "git+https://github.com/RustCrypto/block-modes.git#3ec1c8191dea30def40c033513bbc8bdb3a9cd78" +version = "0.10.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f239edce204df0e4503cccef3492552773d1ca4e002659a59ca715f099b45ca1" dependencies = [ "cipher", ] @@ -284,9 +289,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.11.0-pre.10" +version = "0.11.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c478574b20020306f98d61c8ca3322d762e1ff08117422ac6106438605ea516" +checksum = "460dd7f37e4950526b54a5a6b1f41b6c8e763c58eb9a8fc8fc05ba5c2f44ca7b" dependencies = [ "block-buffer", "crypto-common", @@ -319,11 +324,11 @@ dependencies = [ [[package]] name = "ghash" -version = "0.6.0-rc.0" -source = "git+https://github.com/RustCrypto/universal-hashes.git#448baca3324d259b0c7dd318f431910f3d25e691" +version = "0.6.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7df2ef47489983b86b012ce4955b61fcfb1a99a761a1a8c79c3129e722da6795" dependencies = [ - "opaque-debug", - "polyval 0.7.0-rc.0 (git+https://github.com/RustCrypto/universal-hashes.git)", + "polyval", ] [[package]] @@ -369,8 +374,9 @@ dependencies = [ [[package]] name = "inout" -version = "0.2.0-rc.4" -source = "git+https://github.com/RustCrypto/utils.git#7560ec86787c1342147a8d8ac61a80f5363589a3" +version = "0.2.0-rc.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c774c86bce20ea04abe1c37cf0051c5690079a3a28ef5fdac2a5a0412b3d7d74" dependencies = [ "hybrid-array", ] @@ -404,8 +410,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "pmac" -version = "0.8.0-pre.2" -source = "git+https://github.com/RustCrypto/MACs.git#48d909bc7c028df8ccbc4bd746e9315d2cb8757a" +version = "0.8.0-rc.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42d2ce38a15f4109ba14559b415880704fcf24c529b77ea488855553d1d56f1" dependencies = [ "cipher", "dbl", @@ -425,24 +432,12 @@ dependencies = [ [[package]] name = "polyval" -version = "0.7.0-rc.0" +version = "0.7.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01cbf5c028f9f862c6f7f5a5544307d7858634df190488d432ec470c8fbc063" +checksum = "ff52e661730d7c6f95a72137e812e337eb5ff371d38d8588798e0df8404e610c" dependencies = [ "cfg-if", "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "polyval" -version = "0.7.0-rc.0" -source = "git+https://github.com/RustCrypto/universal-hashes.git#448baca3324d259b0c7dd318f431910f3d25e691" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", "universal-hash", ] @@ -510,9 +505,9 @@ checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "universal-hash" -version = "0.6.0-rc.0" +version = "0.6.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3517d72c5ca6d60f9f2e85d2c772e2652830062a685105a528d19dd823cf87d5" +checksum = "17866ce72039aaa929b785c51d08d0395e02cb5eaffd3efdf634b9b1f80b8157" dependencies = [ "crypto-common", "subtle", @@ -609,7 +604,7 @@ dependencies = [ "aes", "aes-gcm", "cipher", - "hex-literal 0.4.1", + "hex-literal 1.0.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 8307a1d4..55690e1f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,19 +18,3 @@ resolver = "2" [patch.crates-io] aead-stream = { path = "./aead-stream" } aes-gcm = { path = "./aes-gcm" } - -aead = { git = "https://github.com/RustCrypto/traits.git" } -crypto-common = { git = "https://github.com/RustCrypto/traits.git" } - -chacha20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" } - -ctr = { git = "https://github.com/RustCrypto/block-modes.git" } - -ghash = { git = "https://github.com/RustCrypto/universal-hashes.git" } - -pmac = { git = "https://github.com/RustCrypto/MACs.git" } - -belt-ctr = { git = "https://github.com/RustCrypto/block-modes.git" } - -# https://github.com/RustCrypto/utils/pull/1170 -inout = { git = "https://github.com/RustCrypto/utils.git" } diff --git a/aead-stream/Cargo.toml b/aead-stream/Cargo.toml index d5d838ea..0de05950 100644 --- a/aead-stream/Cargo.toml +++ b/aead-stream/Cargo.toml @@ -13,7 +13,7 @@ categories = ["cryptography", "no-std"] rust-version = "1.85" [dependencies] -aead = { version = "=0.6.0-rc.0", default-features = false } +aead = { version = "=0.6.0-rc.1", default-features = false } [features] alloc = ["aead/alloc"] diff --git a/aes-gcm-siv/Cargo.toml b/aes-gcm-siv/Cargo.toml index 33c20ad4..6795bb03 100644 --- a/aes-gcm-siv/Cargo.toml +++ b/aes-gcm-siv/Cargo.toml @@ -17,16 +17,16 @@ categories = ["cryptography", "no-std"] rust-version = "1.85" [dependencies] -aead = { version = "0.6.0-rc.0", default-features = false } -aes = { version = "=0.9.0-pre.3", optional = true } -cipher = "=0.5.0-pre.8" -ctr = "0.10.0-pre.2" +aead = { version = "0.6.0-rc.1", default-features = false } +aes = { version = "0.9.0-rc.0", optional = true } +cipher = "0.5.0-rc.0" +ctr = "0.10.0-rc.0" polyval = { version = "0.7.0-rc.0", default-features = false } subtle = { version = "2", default-features = false } zeroize = { version = "1", optional = true, default-features = false } [dev-dependencies] -aead = { version = "0.6.0-rc.0", features = ["dev"], default-features = false } +aead = { version = "0.6.0-rc.1", features = ["dev"], default-features = false } [features] default = ["aes", "alloc", "os_rng"] diff --git a/aes-gcm/Cargo.toml b/aes-gcm/Cargo.toml index 774e9fd5..2ce077db 100644 --- a/aes-gcm/Cargo.toml +++ b/aes-gcm/Cargo.toml @@ -17,16 +17,16 @@ categories = ["cryptography", "no-std"] rust-version = "1.85" [dependencies] -aead = { version = "0.6.0-rc.0", default-features = false } -aes = { version = "=0.9.0-pre.3", optional = true } -cipher = "=0.5.0-pre.8" -ctr = "0.10.0-pre.2" -ghash = { version = "0.6.0-rc.0", default-features = false } +aead = { version = "0.6.0-rc.1", default-features = false } +aes = { version = "0.9.0-rc.0", optional = true } +cipher = "0.5.0-rc.0" +ctr = "0.10.0-rc.0" +ghash = { version = "0.6.0-rc.1", default-features = false } subtle = { version = "2", default-features = false } zeroize = { version = "1", optional = true, default-features = false } [dev-dependencies] -aead = { version = "0.6.0-rc.0", features = ["alloc", "dev"], default-features = false } +aead = { version = "0.6.0-rc.1", features = ["alloc", "dev"], default-features = false } hex-literal = "0.4" [features] diff --git a/aes-siv/Cargo.toml b/aes-siv/Cargo.toml index d290c7a7..410df296 100644 --- a/aes-siv/Cargo.toml +++ b/aes-siv/Cargo.toml @@ -17,22 +17,22 @@ categories = ["cryptography", "no-std"] rust-version = "1.85" [dependencies] -aead = "0.6.0-rc.0" -aes = "=0.9.0-pre.3" -cipher = "=0.5.0-pre.8" -cmac = "0.8.0-pre.2" -ctr = "0.10.0-pre.2" +aead = "0.6.0-rc.1" +aes = "0.9.0-rc.0" +cipher = "0.5.0-rc.0" +cmac = "0.8.0-rc.0" +ctr = "0.10.0-rc.0" dbl = "0.4.0-rc.1" -digest = { version = "=0.11.0-pre.10", features = ["mac"] } +digest = { version = "0.11.0-rc.0", features = ["mac"] } zeroize = { version = "1", optional = true, default-features = false } # optional dependencies -pmac = { version = "0.8.0-pre.2", optional = true } +pmac = { version = "0.8.0-rc.0", optional = true } [dev-dependencies] blobby = "0.3" -hex-literal = "0.4" -aead = { version = "0.6.0-rc.0", features = ["alloc", "dev"], default-features = false } +hex-literal = "1" +aead = { version = "0.6.0-rc.1", features = ["alloc", "dev"], default-features = false } [features] default = ["alloc", "os_rng"] diff --git a/ascon-aead128/Cargo.toml b/ascon-aead128/Cargo.toml index 028320fb..188c89ce 100644 --- a/ascon-aead128/Cargo.toml +++ b/ascon-aead128/Cargo.toml @@ -12,13 +12,13 @@ categories = ["cryptography", "no-std"] rust-version = "1.85" [dependencies] -aead = { version = "0.6.0-rc.0", default-features = false } +aead = { version = "0.6.0-rc.1", default-features = false } subtle = { version = "2", default-features = false } zeroize = { version = "1.6", optional = true, default-features = false, features = ["derive"] } ascon = "0.4" [dev-dependencies] -aead = { version = "0.6.0-rc.0", features = ["dev"] } +aead = { version = "0.6.0-rc.1", features = ["dev"] } [features] default = ["alloc", "os_rng"] diff --git a/belt-dwp/Cargo.toml b/belt-dwp/Cargo.toml index d0bb180d..49b1d16c 100644 --- a/belt-dwp/Cargo.toml +++ b/belt-dwp/Cargo.toml @@ -12,14 +12,14 @@ categories = ["cryptography", "no-std"] rust-version = "1.85" [dependencies] -aead = { version = "0.6.0-rc.0", default-features = false } +aead = { version = "0.6.0-rc.1", default-features = false } zeroize = { version = "1.7", default-features = false, optional = true } universal-hash = { version = "0.6.0-rc.0" } opaque-debug = { version = "0.3" } subtle = { version = "2", default-features = false } -belt-block = { version = "0.2.0-pre.2" } -belt-ctr = { version = "0.2.0-pre" } +belt-block = { version = "0.2.0-rc.0" } +belt-ctr = { version = "0.2.0-rc.0" } [dev-dependencies] hex-literal = "1" diff --git a/benches/Cargo.toml b/benches/Cargo.toml index 7a02837d..4ec254b3 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -13,7 +13,7 @@ rust-version = "1.56" [dependencies] criterion = "0.4.0" rand = "0.9.0" -aes = "=0.9.0-pre.3" +aes = "0.9.0-rc.0" aes-gcm = { path = "../aes-gcm/" } aes-gcm-siv = { path = "../aes-gcm-siv/" } ascon-aead = { path = "../ascon-aead/" } @@ -57,12 +57,3 @@ harness = false [patch.crates-io] aead-stream = { path = "../aead-stream" } -crypto-common = { git = "https://github.com/RustCrypto/traits.git" } -aead = { git = "https://github.com/RustCrypto/traits.git" } - -chacha20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" } - -ctr = { git = "https://github.com/baloo/block-modes.git", branch = "baloo/edition-2024" } - -ghash = { git = "https://github.com/RustCrypto/universal-hashes.git" } -polyval = { git = "https://github.com/RustCrypto/universal-hashes.git" } diff --git a/ccm/Cargo.toml b/ccm/Cargo.toml index cc43be2a..114ff70d 100644 --- a/ccm/Cargo.toml +++ b/ccm/Cargo.toml @@ -14,14 +14,14 @@ keywords = ["encryption", "aead"] rust-version = "1.85" [dependencies] -aead = { version = "0.6.0-rc.0", default-features = false } -cipher = { version = "=0.5.0-pre.8", default-features = false } -ctr = { version = "0.10.0-pre.2", default-features = false } +aead = { version = "0.6.0-rc.1", default-features = false } +cipher = { version = "0.5.0-rc.0", default-features = false } +ctr = { version = "0.10.0-rc.0", default-features = false } subtle = { version = "2", default-features = false } [dev-dependencies] -aead = { version = "0.6.0-rc.0", features = ["dev"], default-features = false } -aes = { version = "=0.9.0-pre.3" } +aead = { version = "0.6.0-rc.1", features = ["dev"], default-features = false } +aes = { version = "0.9.0-rc.0" } hex-literal = "0.4.1" [features] diff --git a/chacha20poly1305/Cargo.toml b/chacha20poly1305/Cargo.toml index 6be0a7ca..6c2c1a5c 100644 --- a/chacha20poly1305/Cargo.toml +++ b/chacha20poly1305/Cargo.toml @@ -20,14 +20,14 @@ categories = ["cryptography", "no-std"] rust-version = "1.85" [dependencies] -aead = { version = "0.6.0-rc.0", default-features = false } -chacha20 = { version = "=0.10.0-pre.3", default-features = false, features = ["xchacha"] } -cipher = "=0.5.0-pre.8" +aead = { version = "0.6.0-rc.1", default-features = false } +chacha20 = { version = "0.10.0-rc.0", default-features = false, features = ["xchacha"] } +cipher = "0.5.0-rc.0" poly1305 = "0.9.0-rc.0" zeroize = { version = "1.8", optional = true, default-features = false } [dev-dependencies] -aead = { version = "0.6.0-rc.0", features = ["dev"], default-features = false } +aead = { version = "0.6.0-rc.1", features = ["dev"], default-features = false } [features] default = ["alloc", "os_rng"] diff --git a/deoxys/Cargo.toml b/deoxys/Cargo.toml index 7c360207..2bfb013f 100644 --- a/deoxys/Cargo.toml +++ b/deoxys/Cargo.toml @@ -18,13 +18,13 @@ edition = "2024" rust-version = "1.85" [dependencies] -aead = { version = "0.6.0-rc.0", default-features = false } -aes = { version = "=0.9.0-pre.3", features = ["hazmat"], default-features = false } +aead = { version = "0.6.0-rc.1", default-features = false } +aes = { version = "0.9.0-rc.0", features = ["hazmat"], default-features = false } subtle = { version = "2", default-features = false } zeroize = { version = "1", optional = true, default-features = false } [dev-dependencies] -aead = { version = "0.6.0-rc.0", features = ["dev"], default-features = false } +aead = { version = "0.6.0-rc.1", features = ["dev"], default-features = false } hex-literal = "0.4" [features] diff --git a/eax/Cargo.toml b/eax/Cargo.toml index 9152c064..2e2e43fd 100644 --- a/eax/Cargo.toml +++ b/eax/Cargo.toml @@ -20,15 +20,15 @@ categories = ["cryptography", "no-std"] rust-version = "1.85" [dependencies] -aead = { version = "0.6.0-rc.0", default-features = false } -cipher = "=0.5.0-pre.8" -cmac = "0.8.0-pre.2" -ctr = "0.10.0-pre.2" +aead = { version = "0.6.0-rc.1", default-features = false } +cipher = "0.5.0-rc.0" +cmac = "0.8.0-rc.0" +ctr = "0.10.0-rc.0" subtle = { version = "2", default-features = false } [dev-dependencies] -aead = { version = "0.6.0-rc.0", features = ["dev"], default-features = false } -aes = "=0.9.0-pre.3" +aead = { version = "0.6.0-rc.1", features = ["dev"], default-features = false } +aes = "0.9.0-rc.0" [features] default = ["alloc", "os_rng"] diff --git a/ocb3/Cargo.toml b/ocb3/Cargo.toml index 4e7fd1c2..7cbc46a8 100644 --- a/ocb3/Cargo.toml +++ b/ocb3/Cargo.toml @@ -16,17 +16,17 @@ categories = ["cryptography", "no-std"] rust-version = "1.85" [dependencies] -aead = { version = "0.6.0-rc.0", default-features = false } -cipher = "=0.5.0-pre.8" -ctr = "0.10.0-pre.2" +aead = { version = "0.6.0-rc.1", default-features = false } +cipher = "0.5.0-rc.0" +ctr = "0.10.0-rc.0" dbl = "0.4.0-rc.2" subtle = { version = "2", default-features = false } aead-stream = { version = "=0.6.0-pre", optional = true, default-features = false } zeroize = { version = "1", optional = true, default-features = false } [dev-dependencies] -aead = { version = "0.6.0-rc.0", features = ["dev"], default-features = false } -aes = { version = "=0.9.0-pre.3", default-features = false } +aead = { version = "0.6.0-rc.1", features = ["dev"], default-features = false } +aes = { version = "0.9.0-rc.0", default-features = false } hex-literal = "0.4" [features] diff --git a/xaes-256-gcm/Cargo.toml b/xaes-256-gcm/Cargo.toml index af947986..c3fda3e2 100644 --- a/xaes-256-gcm/Cargo.toml +++ b/xaes-256-gcm/Cargo.toml @@ -16,15 +16,15 @@ categories = ["cryptography", "no-std"] rust-version = "1.85" [dependencies] -aead = { version = "0.6.0-rc.0", default-features = false } -aes = "=0.9.0-pre.3" +aead = { version = "0.6.0-rc.1", default-features = false } +aes = "0.9.0-rc.0" aes-gcm = { version = "=0.11.0-pre.2", default-features = false, features = ["aes"] } -cipher = "=0.5.0-pre.8" +cipher = "0.5.0-rc.0" aead-stream = { version = "=0.6.0-pre", optional = true, default-features = false } [dev-dependencies] -aead = { version = "0.6.0-rc.0", features = ["dev"], default-features = false } -hex-literal = "0.4" +aead = { version = "0.6.0-rc.1", features = ["dev"], default-features = false } +hex-literal = "1" [features] default = ["alloc", "os_rng"]