diff --git a/Cargo.lock b/Cargo.lock index a95a99bf..a9bb9538 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,7 +19,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", - "cipher", + "cipher 0.4.3", "cpufeatures", ] @@ -31,8 +31,8 @@ checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead", "aes", - "cipher", - "ctr", + "cipher 0.4.3", + "ctr 0.9.2", "ghash", "subtle", ] @@ -45,8 +45,8 @@ checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" dependencies = [ "aead", "aes", - "cipher", - "ctr", + "cipher 0.4.3", + "ctr 0.9.2", "polyval", "subtle", "zeroize", @@ -60,9 +60,9 @@ checksum = "7e08d0cdb774acd1e4dac11478b1a0c0d203134b2aab0ba25eb430de9b18f8b9" dependencies = [ "aead", "aes", - "cipher", + "cipher 0.4.3", "cmac", - "ctr", + "ctr 0.9.2", "dbl", "digest 0.10.7", "zeroize", @@ -282,6 +282,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-buffer" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be" +dependencies = [ + "hybrid-array", +] + [[package]] name = "bumpalo" version = "3.12.0" @@ -316,7 +325,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7fc89c7c5b9e7a02dfe45cd2367bae382f9ed31c61ca8debe5f827c420a2f08" dependencies = [ "cfg-if", - "cipher", + "cipher 0.4.3", "cpufeatures", ] @@ -328,7 +337,7 @@ checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ "aead", "chacha20", - "cipher", + "cipher 0.4.3", "poly1305", "zeroize", ] @@ -353,11 +362,22 @@ 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 = [ + "block-buffer 0.12.0", + "crypto-common 0.2.1", + "inout 0.2.2", +] + [[package]] name = "clap" version = "2.34.0" @@ -379,7 +399,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", ] @@ -463,6 +483,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 +538,16 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cipher", + "cipher 0.4.3", +] + +[[package]] +name = "ctr" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17469f8eb9bdbfad10f71f4cfddfd38b01143520c0e717d8796ccb4d44d44e42" +dependencies = [ + "cipher 0.5.1", ] [[package]] @@ -620,7 +658,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.3", "const-oid", - "crypto-common", + "crypto-common 0.1.6", "subtle", ] @@ -1217,6 +1255,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 +1424,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" @@ -2490,7 +2546,7 @@ dependencies = [ "aes-gcm", "aes-gcm-siv", "chacha20poly1305", - "ctr", + "ctr 0.10.0", "generic-array", "tink-core", "tink-mac", @@ -2621,7 +2677,7 @@ version = "0.3.0" dependencies = [ "aes", "aes-gcm", - "ctr", + "ctr 0.10.0", "tink-core", "tink-mac", "tink-proto", @@ -2909,9 +2965,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 +3014,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..9aa4fad8 100644 --- a/aead/Cargo.toml +++ b/aead/Cargo.toml @@ -19,7 +19,7 @@ aes = "^0.8.4" aes-gcm = "^0.10.3" aes-gcm-siv = "^0.11.1" chacha20poly1305 = "^0.10" -ctr = "^0.9.2" +ctr = "^0.10.0" generic-array = "^0.14.7" tink-core = "^0.3" tink-mac = "^0.3" diff --git a/streaming/Cargo.toml b/streaming/Cargo.toml index 7f17a13b..8d637cfc 100644 --- a/streaming/Cargo.toml +++ b/streaming/Cargo.toml @@ -16,7 +16,7 @@ rust-version = "1.78.0" aes = "^0.8.4" # Need the `std` feature for Error type conversion aes-gcm = { version = "^0.10.3", features = ["std"] } -ctr = "^0.9.2" +ctr = "^0.10.0" tink-core = "^0.3" tink-mac = "^0.3" tink-proto = "^0.3"