diff --git a/Cargo.lock b/Cargo.lock index a95a99bf..107b96bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ - "crypto-common", + "crypto-common 0.1.6", "generic-array", ] @@ -19,8 +19,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", - "cipher", - "cpufeatures", + "cipher 0.4.3", + "cpufeatures 0.2.9", +] + +[[package]] +name = "aes" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66bd29a732b644c0431c6140f370d097879203d79b80c94a6747ba0872adaef8" +dependencies = [ + "cipher 0.5.1", + "cpubits", + "cpufeatures 0.3.0", ] [[package]] @@ -30,8 +41,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead", - "aes", - "cipher", + "aes 0.8.4", + "cipher 0.4.3", "ctr", "ghash", "subtle", @@ -44,8 +55,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" dependencies = [ "aead", - "aes", - "cipher", + "aes 0.8.4", + "cipher 0.4.3", "ctr", "polyval", "subtle", @@ -59,8 +70,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e08d0cdb774acd1e4dac11478b1a0c0d203134b2aab0ba25eb430de9b18f8b9" dependencies = [ "aead", - "aes", - "cipher", + "aes 0.8.4", + "cipher 0.4.3", "cmac", "ctr", "dbl", @@ -316,8 +327,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7fc89c7c5b9e7a02dfe45cd2367bae382f9ed31c61ca8debe5f827c420a2f08" dependencies = [ "cfg-if", - "cipher", - "cpufeatures", + "cipher 0.4.3", + "cpufeatures 0.2.9", ] [[package]] @@ -328,7 +339,7 @@ checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ "aead", "chacha20", - "cipher", + "cipher 0.4.3", "poly1305", "zeroize", ] @@ -353,11 +364,21 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" dependencies = [ - "crypto-common", - "inout", + "crypto-common 0.1.6", + "inout 0.1.3", "zeroize", ] +[[package]] +name = "cipher" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e34d8227fe1ba289043aeb13792056ff80fd6de1a9f49137a5f499de8e8c78ea" +dependencies = [ + "crypto-common 0.2.1", + "inout 0.2.2", +] + [[package]] name = "clap" version = "2.34.0" @@ -379,7 +400,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8543454e3c3f5126effff9cd44d562af4e31fb8ce1cc0d3dcd8f084515dbc1aa" dependencies = [ - "cipher", + "cipher 0.4.3", "dbl", "digest 0.10.7", ] @@ -422,6 +443,12 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +[[package]] +name = "cpubits" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef0c543070d296ea414df2dd7625d1b24866ce206709d8a4a424f28377f5861" + [[package]] name = "cpufeatures" version = "0.2.9" @@ -431,6 +458,15 @@ dependencies = [ "libc", ] +[[package]] +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + [[package]] name = "crc32fast" version = "1.3.2" @@ -463,6 +499,15 @@ dependencies = [ "typenum", ] +[[package]] +name = "crypto-common" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710" +dependencies = [ + "hybrid-array", +] + [[package]] name = "crypto-mac" version = "0.11.1" @@ -509,7 +554,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher", + "cipher 0.4.3", ] [[package]] @@ -519,7 +564,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.9", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", @@ -620,7 +665,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.3", "const-oid", - "crypto-common", + "crypto-common 0.1.6", "subtle", ] @@ -1217,6 +1262,15 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "hybrid-array" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3944cf8cf766b40e2a1a333ee5e9b563f854d5fa49d6a8ca2764e97c6eddb214" +dependencies = [ + "typenum", +] + [[package]] name = "hyper" version = "0.14.24" @@ -1377,6 +1431,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "inout" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4250ce6452e92010fdf7268ccc5d14faa80bb12fc741938534c58f16804e03c7" +dependencies = [ + "hybrid-array", +] + [[package]] name = "instant" version = "0.1.12" @@ -1711,7 +1774,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ - "cpufeatures", + "cpufeatures 0.2.9", "opaque-debug", "universal-hash", ] @@ -1723,7 +1786,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.9", "opaque-debug", "universal-hash", ] @@ -2252,7 +2315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.9", "digest 0.10.7", ] @@ -2264,7 +2327,7 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if", - "cpufeatures", + "cpufeatures 0.2.9", "digest 0.9.0", "opaque-debug", ] @@ -2276,7 +2339,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.9", "digest 0.10.7", ] @@ -2486,7 +2549,7 @@ name = "tink-aead" version = "0.3.0" dependencies = [ "aead", - "aes", + "aes 0.9.0", "aes-gcm", "aes-gcm-siv", "chacha20poly1305", @@ -2580,7 +2643,7 @@ dependencies = [ name = "tink-prf" version = "0.3.0" dependencies = [ - "aes", + "aes 0.9.0", "cmac", "digest 0.10.7", "hkdf", @@ -2619,7 +2682,7 @@ dependencies = [ name = "tink-streaming-aead" version = "0.3.0" dependencies = [ - "aes", + "aes 0.9.0", "aes-gcm", "ctr", "tink-core", @@ -2909,9 +2972,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "typenum" -version = "1.16.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "unicase" @@ -2958,7 +3021,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5" dependencies = [ - "crypto-common", + "crypto-common 0.1.6", "subtle", ] diff --git a/aead/Cargo.toml b/aead/Cargo.toml index d3ed18b6..c4901c65 100644 --- a/aead/Cargo.toml +++ b/aead/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.78.0" [dependencies] # Need the `std` feature for Error type conversion aead = { version = "^0.5.2", features = ["std"] } -aes = "^0.8.4" +aes = "^0.9.0" aes-gcm = "^0.10.3" aes-gcm-siv = "^0.11.1" chacha20poly1305 = "^0.10" diff --git a/prf/Cargo.toml b/prf/Cargo.toml index 96633f13..48fa0021 100644 --- a/prf/Cargo.toml +++ b/prf/Cargo.toml @@ -13,7 +13,7 @@ categories = ["cryptography"] rust-version = "1.78.0" [dependencies] -aes = "^0.8.4" +aes = "^0.9.0" cmac = "^0.7.2" digest = "^0.10.7" hkdf = "^0.12.4" diff --git a/streaming/Cargo.toml b/streaming/Cargo.toml index 7f17a13b..d145ddb7 100644 --- a/streaming/Cargo.toml +++ b/streaming/Cargo.toml @@ -13,7 +13,7 @@ categories = ["cryptography"] rust-version = "1.78.0" [dependencies] -aes = "^0.8.4" +aes = "^0.9.0" # Need the `std` feature for Error type conversion aes-gcm = { version = "^0.10.3", features = ["std"] } ctr = "^0.9.2"