From 92cfdf3c2a239cd767528214242c976f16945a6b Mon Sep 17 00:00:00 2001 From: Matthew James Briggs Date: Fri, 8 Mar 2024 12:22:58 -0800 Subject: [PATCH 1/6] update dependencies --- Cargo.lock | 783 +++++++++--------- deny.toml | 15 +- tough-kms/Cargo.toml | 6 +- tough-ssm/Cargo.toml | 2 +- tough/Cargo.toml | 4 +- tough/src/editor/test.rs | 12 +- tough/tests/repo_editor.rs | 56 +- tough/tests/test_utils.rs | 5 + tuftool/Cargo.toml | 2 +- tuftool/src/datetime.rs | 25 +- tuftool/src/error.rs | 2 +- tuftool/tests/create_command.rs | 9 +- .../tests/create_repository_integration.rs | 15 +- tuftool/tests/delegation_commands.rs | 85 +- tuftool/tests/test_utils.rs | 13 +- tuftool/tests/update_command.rs | 27 +- 16 files changed, 568 insertions(+), 493 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 671794a7..9ba9cd1c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,9 +43,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -57,43 +57,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "assert-json-diff" @@ -108,12 +108,12 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.12" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" +checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8" dependencies = [ "anstyle", - "bstr 1.7.0", + "bstr 1.9.1", "doc-comment", "predicates", "predicates-core", @@ -129,7 +129,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -151,18 +151,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -192,7 +192,7 @@ dependencies = [ "bytes", "fastrand", "hex", - "http 0.2.11", + "http 0.2.12", "hyper", "ring", "time", @@ -228,7 +228,7 @@ dependencies = [ "aws-types", "bytes", "fastrand", - "http 0.2.11", + "http 0.2.12", "http-body", "percent-encoding", "pin-project-lite", @@ -252,7 +252,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http 0.2.11", + "http 0.2.12", "once_cell", "regex-lite", "tracing", @@ -275,7 +275,7 @@ dependencies = [ "aws-types", "bytes", "fastrand", - "http 0.2.11", + "http 0.2.12", "once_cell", "regex-lite", "tracing", @@ -297,7 +297,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http 0.2.11", + "http 0.2.12", "once_cell", "regex-lite", "tracing", @@ -319,7 +319,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http 0.2.11", + "http 0.2.12", "once_cell", "regex-lite", "tracing", @@ -342,7 +342,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "http 0.2.11", + "http 0.2.12", "once_cell", "regex-lite", "tracing", @@ -362,7 +362,7 @@ dependencies = [ "form_urlencoded", "hex", "hmac", - "http 0.2.11", + "http 0.2.12", "http 1.1.0", "once_cell", "percent-encoding", @@ -393,7 +393,7 @@ dependencies = [ "bytes", "bytes-utils", "futures-core", - "http 0.2.11", + "http 0.2.12", "http-body", "once_cell", "percent-encoding", @@ -419,7 +419,7 @@ checksum = "882b95acc2ed531309fad4b6bc87486383bb89f644a4243b377a00895c701f00" dependencies = [ "assert-json-diff", "aws-smithy-runtime-api", - "http 0.2.11", + "http 0.2.12", "pretty_assertions", "regex-lite", "roxmltree", @@ -451,7 +451,7 @@ dependencies = [ "bytes", "fastrand", "h2", - "http 0.2.11", + "http 0.2.12", "http-body", "hyper", "hyper-rustls", @@ -475,7 +475,7 @@ dependencies = [ "aws-smithy-async", "aws-smithy-types", "bytes", - "http 0.2.11", + "http 0.2.12", "http 1.1.0", "pin-project-lite", "tokio", @@ -493,7 +493,7 @@ dependencies = [ "bytes", "bytes-utils", "futures-core", - "http 0.2.11", + "http 0.2.12", "http-body", "itoa", "num-integer", @@ -525,7 +525,7 @@ dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", "aws-smithy-types", - "http 0.2.11", + "http 0.2.12", "rustc_version", "tracing", ] @@ -541,7 +541,7 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http 0.2.11", + "http 0.2.12", "http-body", "hyper", "itoa", @@ -571,7 +571,7 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 0.2.11", + "http 0.2.12", "http-body", "mime", "rustversion", @@ -596,9 +596,15 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "base64-simd" @@ -618,9 +624,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "block-buffer" @@ -655,20 +661,20 @@ dependencies = [ [[package]] name = "bstr" -version = "1.7.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.6", "serde", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytes" @@ -678,9 +684,9 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bytes-utils" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" +checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" dependencies = [ "bytes", "either", @@ -688,12 +694,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" [[package]] name = "cfg-if" @@ -703,22 +706,22 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets", + "windows-targets 0.52.4", ] [[package]] name = "clap" -version = "4.4.11" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" dependencies = [ "clap_builder", "clap_derive", @@ -726,9 +729,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -738,21 +741,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" @@ -762,9 +765,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -772,61 +775,52 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crypto-common" @@ -840,9 +834,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -878,15 +872,15 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "dyn-clone" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "encoding_rs" @@ -897,14 +891,20 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -974,9 +974,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -989,9 +989,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -999,15 +999,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1016,38 +1016,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1086,9 +1086,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -1097,35 +1097,35 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "globset" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", - "bstr 1.7.0", - "fnv", + "bstr 1.9.1", "log", - "regex", + "regex-automata 0.4.6", + "regex-syntax", ] [[package]] name = "h2" -version = "0.3.21" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.11", + "http 0.2.12", "indexmap", "slab", "tokio", @@ -1135,9 +1135,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -1147,9 +1147,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1174,9 +1174,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1196,12 +1196,12 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http 0.2.12", "pin-project-lite", ] @@ -1234,7 +1234,7 @@ dependencies = [ "crossbeam-channel", "form_urlencoded", "futures", - "http 0.2.11", + "http 0.2.12", "hyper", "log", "once_cell", @@ -1247,22 +1247,22 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", - "http 0.2.11", + "http 0.2.12", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", @@ -1276,7 +1276,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http 0.2.11", + "http 0.2.12", "hyper", "log", "rustls", @@ -1300,9 +1300,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1333,11 +1333,11 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.3" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ - "autocfg", + "equivalent", "hashbrown", ] @@ -1347,26 +1347,17 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1379,21 +1370,21 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "loom" @@ -1423,18 +1414,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "mime" @@ -1454,22 +1436,22 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1545,21 +1527,26 @@ dependencies = [ "winapi", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] @@ -1576,18 +1563,18 @@ dependencies = [ [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -1603,17 +1590,17 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.60" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cfg-if", "foreign-types", "libc", @@ -1630,7 +1617,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -1641,9 +1628,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.96" +version = "0.9.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" dependencies = [ "cc", "libc", @@ -1675,7 +1662,7 @@ version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" dependencies = [ - "base64", + "base64 0.21.7", "serde", ] @@ -1687,22 +1674,22 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -1719,9 +1706,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "powerfmt" @@ -1737,13 +1724,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "3.0.4" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" +checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" dependencies = [ "anstyle", "difflib", - "itertools", "predicates-core", ] @@ -1799,18 +1785,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -1847,9 +1833,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -1857,32 +1843,23 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.6", "regex-syntax", ] @@ -1894,9 +1871,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -1917,17 +1894,17 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" dependencies = [ - "base64", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", "futures-util", "h2", - "http 0.2.11", + "http 0.2.12", "http-body", "hyper", "hyper-rustls", @@ -1945,6 +1922,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -1962,16 +1940,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin", "untrusted", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -2000,22 +1979,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.8" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", @@ -2037,11 +2016,11 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64", + "base64 0.21.7", ] [[package]] @@ -2062,9 +2041,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -2077,11 +2056,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -2090,12 +2069,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - [[package]] name = "sct" version = "0.7.1" @@ -2131,35 +2104,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -2168,9 +2141,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" dependencies = [ "itoa", "serde", @@ -2228,9 +2201,9 @@ dependencies = [ [[package]] name = "simplelog" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369" +checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0" dependencies = [ "log", "termcolor", @@ -2248,18 +2221,17 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "snafu" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" +checksum = "75976f4748ab44f6e5332102be424e7c2dc18daeaf7e725f2040c3ebb133512e" dependencies = [ "backtrace", - "doc-comment", "futures-core", "pin-project", "snafu-derive", @@ -2267,34 +2239,24 @@ dependencies = [ [[package]] name = "snafu-derive" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" +checksum = "b4b19911debfb8c2fb1107bc6cb2d61868aaf53a988449213959bb1b5b1ed95f" dependencies = [ "heck", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", + "syn 2.0.52", ] [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -2305,9 +2267,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "subtle" @@ -2328,9 +2290,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -2366,22 +2328,21 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", "rustix", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.1.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -2394,29 +2355,29 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -2424,13 +2385,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -2446,10 +2408,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -2470,9 +2433,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -2481,9 +2444,9 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2494,7 +2457,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -2626,9 +2589,9 @@ dependencies = [ "aws-smithy-http", "aws-smithy-runtime", "aws-smithy-types", - "base64", + "base64 0.22.0", "bytes", - "http 0.2.11", + "http 1.1.0", "pem", "ring", "serde", @@ -2683,11 +2646,11 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "bytes", "futures-core", "futures-util", - "http 0.2.11", + "http 0.2.12", "http-body", "http-range-header", "httpdate", @@ -2734,7 +2697,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -2749,12 +2712,12 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -2770,9 +2733,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "nu-ansi-term", "serde", @@ -2787,9 +2750,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tuftool" @@ -2826,9 +2789,9 @@ dependencies = [ [[package]] name = "typed-path" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a90726108dab678edab76459751e1cc7c597c3484a6384d6423191255fa641b" +checksum = "668404597c2c687647f6f8934f97c280fd500db28557f52b07c56b92d3dc500a" [[package]] name = "typenum" @@ -2847,9 +2810,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -2859,9 +2822,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -2897,9 +2860,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" [[package]] name = "valuable" @@ -2936,9 +2899,9 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -2961,9 +2924,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2971,24 +2934,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.38" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -2998,9 +2961,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3008,28 +2971,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -3040,9 +3003,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.65" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -3050,9 +3013,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "winapi" @@ -3087,11 +3050,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets", + "windows-targets 0.52.4", ] [[package]] @@ -3100,7 +3063,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.4", ] [[package]] @@ -3109,13 +3081,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -3124,42 +3111,84 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + [[package]] name = "winreg" version = "0.50.0" @@ -3167,7 +3196,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3184,6 +3213,6 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/deny.toml b/deny.toml index a38355e6..9a42f072 100644 --- a/deny.toml +++ b/deny.toml @@ -67,6 +67,8 @@ wildcards = "deny" allow-wildcard-paths = true skip = [ + # some libraries are using an older version of base64 + { name = "base64", version = "=0.21" }, # http-test is using an old version of bstr { name = "bstr", version = "=0.2" }, # num_cpus and clap is using old versions of hermit-abi @@ -78,10 +80,19 @@ skip = [ # several dependencies are using an old version of bitflags { name = "bitflags", version = "=1.3" }, { name = "regex-automata", version = "=0.4" }, - # several dependencies are using an old version of socket2 - { name = "socket2", version = "=0.4" }, # noxious, used for testing, is using an old version of tokio-util { name = "tokio-util", version = "=0.6.10" }, + # tokio and mio are bringing in older versions of windows libraries while other + # libraries, are bringing in newer versions + { name = "windows-sys", version = "=0.48" }, + { name = "windows-targets", version = "=0.48" }, + { name = "windows_aarch64_gnullvm", version = "=0.48" }, + { name = "windows_aarch64_msvc", version = "=0.48" }, + { name = "windows_i686_gnu", version = "=0.48" }, + { name = "windows_i686_msvc", version = "=0.48" }, + { name = "windows_x86_64_gnu", version = "=0.48" }, + { name = "windows_x86_64_gnullvm", version = "=0.48" }, + { name = "windows_x86_64_msvc", version = "=0.48" }, ] skip-tree = [ diff --git a/tough-kms/Cargo.toml b/tough-kms/Cargo.toml index bc43886b..c0d0b6ab 100644 --- a/tough-kms/Cargo.toml +++ b/tough-kms/Cargo.toml @@ -18,7 +18,7 @@ tough = { version = "0.16", path = "../tough", features = ["http"] } ring = { version = "0.17", features = ["std"] } aws-sdk-kms = "1" aws-config = "1" -snafu = { version = "0.7", features = ["backtraces-impl-backtrace-crate"] } +snafu = { version = "0.8", features = ["backtraces-impl-backtrace-crate"] } tokio = { version = "1", features = ["fs", "io-util", "time", "macros", "rt-multi-thread"] } pem = "3" @@ -26,8 +26,8 @@ pem = "3" aws-smithy-runtime = {version = "1", features = ["test-util"]} aws-smithy-http = "0.60" aws-smithy-types = "1" -base64 = "0.21" +base64 = "0.22" bytes = "1" -http = "0.2" +http = "1" serde = "1" serde_json = "1" diff --git a/tough-ssm/Cargo.toml b/tough-ssm/Cargo.toml index c8221256..de8f563a 100644 --- a/tough-ssm/Cargo.toml +++ b/tough-ssm/Cargo.toml @@ -17,5 +17,5 @@ aws-sdk-rust-rustls = ["aws-config/rustls", "aws-sdk-ssm/rustls"] tough = { version = "0.16", path = "../tough", features = ["http"] } aws-sdk-ssm = "1" aws-config = "1" -snafu = { version = "0.7", features = ["backtraces-impl-backtrace-crate"] } +snafu = { version = "0.8", features = ["backtraces-impl-backtrace-crate"] } tokio = { version = "1", features = ["fs", "io-util", "time", "macros", "rt-multi-thread"] } diff --git a/tough/Cargo.toml b/tough/Cargo.toml index 5274bef6..70031998 100644 --- a/tough/Cargo.toml +++ b/tough/Cargo.toml @@ -27,9 +27,9 @@ ring = { version = "0.17", features = ["std"] } serde = { version = "1", features = ["derive"] } serde_json = "1" serde_plain = "1" -snafu = { version = "0.7", features = ["futures"] } +snafu = { version = "0.8", features = ["futures"] } tempfile = "3" -tokio = { version = "1", default-features = false, features = ["io-util", "sync", "fs", "time"] } +tokio = { version = "1", default-features = false, features = ["io-util", "sync", "fs", "rt", "time"] } tokio-util = { version = "0.7", features = ["io"] } typed-path = "0.7" untrusted = "0.9" diff --git a/tough/src/editor/test.rs b/tough/src/editor/test.rs index 5f771df9..9d76e5bb 100644 --- a/tough/src/editor/test.rs +++ b/tough/src/editor/test.rs @@ -7,10 +7,14 @@ mod tests { use crate::key_source::LocalKeySource; use crate::schema::{Signed, Snapshot, Target, Targets, Timestamp}; use crate::TargetName; - use chrono::{Duration, Utc}; + use chrono::{TimeDelta, Utc}; use std::num::NonZeroU64; use std::path::PathBuf; + fn days(value: i64) -> TimeDelta { + TimeDelta::try_days(value).unwrap() + } + // Path to the root.json in the reference implementation fn tuf_root_path() -> PathBuf { PathBuf::from(env!("CARGO_MANIFEST_DIR")) @@ -109,11 +113,11 @@ mod tests { let root = root_path(); let root_key = key_path(); let key_source = LocalKeySource { path: root_key }; - let timestamp_expiration = Utc::now().checked_add_signed(Duration::days(3)).unwrap(); + let timestamp_expiration = Utc::now().checked_add_signed(days(3)).unwrap(); let timestamp_version = NonZeroU64::new(1234).unwrap(); - let snapshot_expiration = Utc::now().checked_add_signed(Duration::days(21)).unwrap(); + let snapshot_expiration = Utc::now().checked_add_signed(days(21)).unwrap(); let snapshot_version = NonZeroU64::new(5432).unwrap(); - let targets_expiration = Utc::now().checked_add_signed(Duration::days(13)).unwrap(); + let targets_expiration = Utc::now().checked_add_signed(days(13)).unwrap(); let targets_version = NonZeroU64::new(789).unwrap(); let target1 = targets_path().join("file1.txt"); let target2 = targets_path().join("file2.txt"); diff --git a/tough/tests/repo_editor.rs b/tough/tests/repo_editor.rs index 0eec36e6..ba0972a6 100644 --- a/tough/tests/repo_editor.rs +++ b/tough/tests/repo_editor.rs @@ -1,8 +1,8 @@ // Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: MIT OR Apache-2.0 -use crate::test_utils::{dir_url, read_to_end, test_data}; -use chrono::{Duration, Utc}; +use crate::test_utils::{days, dir_url, read_to_end, test_data}; +use chrono::Utc; use std::collections::HashMap; use std::num::NonZeroU64; use std::path::PathBuf; @@ -78,11 +78,11 @@ async fn load_tuf_reference_impl(paths: &mut RepoPaths) -> Repository { async fn test_repo_editor() -> RepositoryEditor { let root = root_path(); - let timestamp_expiration = Utc::now().checked_add_signed(Duration::days(3)).unwrap(); + let timestamp_expiration = Utc::now().checked_add_signed(days(3)).unwrap(); let timestamp_version = NonZeroU64::new(1234).unwrap(); - let snapshot_expiration = Utc::now().checked_add_signed(Duration::days(21)).unwrap(); + let snapshot_expiration = Utc::now().checked_add_signed(days(21)).unwrap(); let snapshot_version = NonZeroU64::new(5432).unwrap(); - let targets_expiration = Utc::now().checked_add_signed(Duration::days(13)).unwrap(); + let targets_expiration = Utc::now().checked_add_signed(days(13)).unwrap(); let targets_version = NonZeroU64::new(789).unwrap(); let target3 = targets_path().join("file3.txt"); let target_list = vec![target3]; @@ -127,11 +127,11 @@ async fn repository_editor_from_repository() { #[tokio::test] async fn create_sign_write_reload_repo() { let root = root_path(); - let timestamp_expiration = Utc::now().checked_add_signed(Duration::days(3)).unwrap(); + let timestamp_expiration = Utc::now().checked_add_signed(days(3)).unwrap(); let timestamp_version = NonZeroU64::new(1234).unwrap(); - let snapshot_expiration = Utc::now().checked_add_signed(Duration::days(21)).unwrap(); + let snapshot_expiration = Utc::now().checked_add_signed(days(21)).unwrap(); let snapshot_version = NonZeroU64::new(5432).unwrap(); - let targets_expiration = Utc::now().checked_add_signed(Duration::days(13)).unwrap(); + let targets_expiration = Utc::now().checked_add_signed(days(13)).unwrap(); let targets_version = NonZeroU64::new(789).unwrap(); let target3 = targets_path().join("file3.txt"); let target_list = vec![target3]; @@ -170,7 +170,7 @@ async fn create_sign_write_reload_repo() { role1_key, PathSet::Paths(vec![PathPattern::new("file?.txt").unwrap()]), NonZeroU64::new(1).unwrap(), - Utc::now().checked_add_signed(Duration::days(21)).unwrap(), + Utc::now().checked_add_signed(days(21)).unwrap(), NonZeroU64::new(1).unwrap(), ) .await @@ -190,7 +190,7 @@ async fn create_sign_write_reload_repo() { role2_key, PathSet::Paths(vec![PathPattern::new("file1.txt").unwrap()]), NonZeroU64::new(1).unwrap(), - Utc::now().checked_add_signed(Duration::days(21)).unwrap(), + Utc::now().checked_add_signed(days(21)).unwrap(), NonZeroU64::new(1).unwrap(), ) .await @@ -200,7 +200,7 @@ async fn create_sign_write_reload_repo() { role1_key, PathSet::Paths(vec![PathPattern::new("file1.txt").unwrap()]), NonZeroU64::new(1).unwrap(), - Utc::now().checked_add_signed(Duration::days(21)).unwrap(), + Utc::now().checked_add_signed(days(21)).unwrap(), NonZeroU64::new(1).unwrap(), ) .await @@ -220,7 +220,7 @@ async fn create_sign_write_reload_repo() { role2_key, PathSet::Paths(vec![PathPattern::new("file1.txt").unwrap()]), NonZeroU64::new(1).unwrap(), - Utc::now().checked_add_signed(Duration::days(21)).unwrap(), + Utc::now().checked_add_signed(days(21)).unwrap(), NonZeroU64::new(1).unwrap(), ) .await @@ -277,7 +277,7 @@ async fn create_role_flow() { // create new delegated target as "A" and sign with role1_key let new_role = TargetsEditor::new("A") .version(NonZeroU64::new(1).unwrap()) - .expires(Utc::now().checked_add_signed(Duration::days(21)).unwrap()) + .expires(Utc::now().checked_add_signed(days(21)).unwrap()) .sign(role1_key) .await .unwrap(); @@ -321,11 +321,11 @@ async fn create_role_flow() { //sign everything since targets key is the same as snapshot and timestamp let root_key = key_path(); let key_source = LocalKeySource { path: root_key }; - let timestamp_expiration = Utc::now().checked_add_signed(Duration::days(3)).unwrap(); + let timestamp_expiration = Utc::now().checked_add_signed(days(3)).unwrap(); let timestamp_version = NonZeroU64::new(1234).unwrap(); - let snapshot_expiration = Utc::now().checked_add_signed(Duration::days(21)).unwrap(); + let snapshot_expiration = Utc::now().checked_add_signed(days(21)).unwrap(); let snapshot_version = NonZeroU64::new(5432).unwrap(); - let targets_expiration = Utc::now().checked_add_signed(Duration::days(13)).unwrap(); + let targets_expiration = Utc::now().checked_add_signed(days(13)).unwrap(); let targets_version = NonZeroU64::new(789).unwrap(); editor .targets_expires(targets_expiration) @@ -362,7 +362,7 @@ async fn create_role_flow() { // create new delegated target as "B" and sign with role2_key let new_role = TargetsEditor::new("B") .version(NonZeroU64::new(1).unwrap()) - .expires(Utc::now().checked_add_signed(Duration::days(21)).unwrap()) + .expires(Utc::now().checked_add_signed(days(21)).unwrap()) .sign(role2_key) .await .unwrap(); @@ -402,7 +402,7 @@ async fn create_role_flow() { .await .unwrap() .version(NonZeroU64::new(1).unwrap()) - .expires(Utc::now().checked_add_signed(Duration::days(21)).unwrap()); + .expires(Utc::now().checked_add_signed(days(21)).unwrap()); // sign A and write A and B metadata to output directory let signed_roles = editor.sign(role1_key).await.unwrap(); @@ -441,9 +441,9 @@ async fn create_role_flow() { .unwrap(); editor .snapshot_version(NonZeroU64::new(1).unwrap()) - .snapshot_expires(Utc::now().checked_add_signed(Duration::days(21)).unwrap()) + .snapshot_expires(Utc::now().checked_add_signed(days(21)).unwrap()) .timestamp_version(NonZeroU64::new(1).unwrap()) - .timestamp_expires(Utc::now().checked_add_signed(Duration::days(21)).unwrap()); + .timestamp_expires(Utc::now().checked_add_signed(days(21)).unwrap()); let signed_refreshed_repo = editor.sign(&[Box::new(key_source)]).await.unwrap(); @@ -501,7 +501,7 @@ async fn update_targets_flow() { // create new delegated target as "A" and sign with role1_key let new_role = TargetsEditor::new("A") .version(NonZeroU64::new(1).unwrap()) - .expires(Utc::now().checked_add_signed(Duration::days(21)).unwrap()) + .expires(Utc::now().checked_add_signed(days(21)).unwrap()) .sign(role1_key) .await .unwrap(); @@ -545,11 +545,11 @@ async fn update_targets_flow() { //sign everything since targets key is the same as snapshot and timestamp let root_key = key_path(); let key_source = LocalKeySource { path: root_key }; - let timestamp_expiration = Utc::now().checked_add_signed(Duration::days(3)).unwrap(); + let timestamp_expiration = Utc::now().checked_add_signed(days(3)).unwrap(); let timestamp_version = NonZeroU64::new(1234).unwrap(); - let snapshot_expiration = Utc::now().checked_add_signed(Duration::days(21)).unwrap(); + let snapshot_expiration = Utc::now().checked_add_signed(days(21)).unwrap(); let snapshot_version = NonZeroU64::new(5432).unwrap(); - let targets_expiration = Utc::now().checked_add_signed(Duration::days(13)).unwrap(); + let targets_expiration = Utc::now().checked_add_signed(days(13)).unwrap(); let targets_version = NonZeroU64::new(789).unwrap(); editor .targets_expires(targets_expiration) @@ -586,7 +586,7 @@ async fn update_targets_flow() { // create new delegated target as "B" and sign with role2_key let new_role = TargetsEditor::new("B") .version(NonZeroU64::new(1).unwrap()) - .expires(Utc::now().checked_add_signed(Duration::days(21)).unwrap()) + .expires(Utc::now().checked_add_signed(days(21)).unwrap()) .sign(role2_key) .await .unwrap(); @@ -626,7 +626,7 @@ async fn update_targets_flow() { .await .unwrap() .version(NonZeroU64::new(1).unwrap()) - .expires(Utc::now().checked_add_signed(Duration::days(21)).unwrap()); + .expires(Utc::now().checked_add_signed(days(21)).unwrap()); // sign A and write A and B metadata to output directory let signed_roles = editor.sign(role1_key).await.unwrap(); @@ -665,9 +665,9 @@ async fn update_targets_flow() { .unwrap(); editor .snapshot_version(NonZeroU64::new(1).unwrap()) - .snapshot_expires(Utc::now().checked_add_signed(Duration::days(21)).unwrap()) + .snapshot_expires(Utc::now().checked_add_signed(days(21)).unwrap()) .timestamp_version(NonZeroU64::new(1).unwrap()) - .timestamp_expires(Utc::now().checked_add_signed(Duration::days(21)).unwrap()); + .timestamp_expires(Utc::now().checked_add_signed(days(21)).unwrap()); let signed_refreshed_repo = editor.sign(&[Box::new(key_source)]).await.unwrap(); diff --git a/tough/tests/test_utils.rs b/tough/tests/test_utils.rs index fbf9e6e4..4cf17f4e 100644 --- a/tough/tests/test_utils.rs +++ b/tough/tests/test_utils.rs @@ -5,6 +5,7 @@ // cause compiler warnings for unused code, so we suppress them. #![allow(unused)] +use chrono::TimeDelta; use futures::TryStreamExt; use futures_core::Stream; use std::io::Read; @@ -38,3 +39,7 @@ where { stream.into_vec().await.unwrap() } + +pub fn days(value: i64) -> TimeDelta { + TimeDelta::try_days(value).unwrap() +} diff --git a/tuftool/Cargo.toml b/tuftool/Cargo.toml index 2b3d1676..5fe9df8e 100644 --- a/tuftool/Cargo.toml +++ b/tuftool/Cargo.toml @@ -31,7 +31,7 @@ ring = { version = "0.17", features = ["std"] } serde = "1" serde_json = "1" simplelog = "0.12" -snafu = { version = "0.7", features = ["backtraces-impl-backtrace-crate"] } +snafu = { version = "0.8", features = ["backtraces-impl-backtrace-crate"] } tempfile = "3" tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] } tough = { version = "0.16", path = "../tough", features = ["http"] } diff --git a/tuftool/src/datetime.rs b/tuftool/src/datetime.rs index ab5c8e72..ae60e721 100644 --- a/tuftool/src/datetime.rs +++ b/tuftool/src/datetime.rs @@ -3,8 +3,8 @@ use crate::error::{self, Result}; -use chrono::{DateTime, Duration, FixedOffset, Utc}; -use snafu::{ensure, ResultExt}; +use chrono::{DateTime, FixedOffset, TimeDelta, Utc}; +use snafu::{ensure, OptionExt, ResultExt}; /// Parses a user-specified datetime, either in full RFC 3339 format, or a shorthand like "in 7 /// days" @@ -43,9 +43,24 @@ pub(crate) fn parse_datetime(input: &str) -> Result> { .context(error::DateArgCountSnafu { input })?; let duration = match unit_str { - "hour" | "hours" => Duration::hours(i64::from(count)), - "day" | "days" => Duration::days(i64::from(count)), - "week" | "weeks" => Duration::weeks(i64::from(count)), + "hour" | "hours" => { + TimeDelta::try_hours(i64::from(count)).context(error::DateArgInvalidSnafu { + input: count.to_string(), + msg: format!("unable to convert {count} to a number of hours"), + })? + } + "day" | "days" => { + TimeDelta::try_days(i64::from(count)).context(error::DateArgInvalidSnafu { + input: count.to_string(), + msg: format!("unable to convert {count} to a number of days"), + })? + } + "week" | "weeks" => { + TimeDelta::try_weeks(i64::from(count)).context(error::DateArgInvalidSnafu { + input: count.to_string(), + msg: format!("unable to convert {count} to a number of weeks"), + })? + } _ => { return error::DateArgInvalidSnafu { input, diff --git a/tuftool/src/error.rs b/tuftool/src/error.rs index 6baaed06..5fca9a3f 100644 --- a/tuftool/src/error.rs +++ b/tuftool/src/error.rs @@ -47,7 +47,7 @@ pub(crate) enum Error { }, #[snafu(display("Date argument '{}' is invalid: {}", input, msg))] - DateArgInvalid { input: String, msg: &'static str }, + DateArgInvalid { input: String, msg: String }, #[snafu(display( "Date argument had count '{}' that failed to parse as integer: {}", diff --git a/tuftool/tests/create_command.rs b/tuftool/tests/create_command.rs index 6f5a8183..153b74b9 100644 --- a/tuftool/tests/create_command.rs +++ b/tuftool/tests/create_command.rs @@ -3,8 +3,9 @@ mod test_utils; +use crate::test_utils::days; use assert_cmd::Command; -use chrono::{Duration, Utc}; +use chrono::Utc; use tempfile::TempDir; use test_utils::dir_url; use tough::{RepositoryLoader, TargetName}; @@ -12,11 +13,11 @@ use tough::{RepositoryLoader, TargetName}; #[tokio::test] // Ensure we can read a repo created by the `tuftool` binary using the `tough` library async fn create_command() { - let timestamp_expiration = Utc::now().checked_add_signed(Duration::days(3)).unwrap(); + let timestamp_expiration = Utc::now().checked_add_signed(days(3)).unwrap(); let timestamp_version: u64 = 1234; - let snapshot_expiration = Utc::now().checked_add_signed(Duration::days(21)).unwrap(); + let snapshot_expiration = Utc::now().checked_add_signed(days(21)).unwrap(); let snapshot_version: u64 = 5432; - let targets_expiration = Utc::now().checked_add_signed(Duration::days(13)).unwrap(); + let targets_expiration = Utc::now().checked_add_signed(days(13)).unwrap(); let targets_version: u64 = 789; let targets_input_dir = test_utils::test_data() .join("tuf-reference-impl") diff --git a/tuftool/tests/create_repository_integration.rs b/tuftool/tests/create_repository_integration.rs index 625eafb5..d5f77820 100644 --- a/tuftool/tests/create_repository_integration.rs +++ b/tuftool/tests/create_repository_integration.rs @@ -1,14 +1,15 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: MIT OR Apache-2.0 -mod test_utils; use assert_cmd::Command; -use chrono::{Duration, Utc}; +use chrono::Utc; use std::env; use tempfile::TempDir; -use test_utils::dir_url; +use test_utils::{days, dir_url}; use tough::{RepositoryLoader, TargetName}; +mod test_utils; + // This file include integration tests for KeySources: tough-ssm, tough-kms and local file key. // Since the tests are run using the actual "AWS SSM and AWS KMS", you would have to configure // AWS credentials with root permission. @@ -69,6 +70,7 @@ fn gen_key(key: &str, root_json: &str) { .assert() .success(); } + fn add_root_key(key: &str, root_json: &str) { Command::cargo_bin("tuftool") .unwrap() @@ -76,6 +78,7 @@ fn add_root_key(key: &str, root_json: &str) { .assert() .success(); } + fn add_key_all_role(key: &str, root_json: &str) { Command::cargo_bin("tuftool") .unwrap() @@ -127,11 +130,11 @@ async fn create_repository(root_key: &str, auto_generate: bool) { add_key_all_role(root_key, root_json.to_str().unwrap()); sign_root_json(root_key, root_json.to_str().unwrap()); // Use root.json file to generate metadata using create command. - let timestamp_expiration = Utc::now().checked_add_signed(Duration::days(3)).unwrap(); + let timestamp_expiration = Utc::now().checked_add_signed(days(3)).unwrap(); let timestamp_version: u64 = 1234; - let snapshot_expiration = Utc::now().checked_add_signed(Duration::days(21)).unwrap(); + let snapshot_expiration = Utc::now().checked_add_signed(days(21)).unwrap(); let snapshot_version: u64 = 5432; - let targets_expiration = Utc::now().checked_add_signed(Duration::days(13)).unwrap(); + let targets_expiration = Utc::now().checked_add_signed(days(13)).unwrap(); let targets_version: u64 = 789; let targets_input_dir = test_utils::test_data() .join("tuf-reference-impl") diff --git a/tuftool/tests/delegation_commands.rs b/tuftool/tests/delegation_commands.rs index 8281be8b..bbb7d8da 100644 --- a/tuftool/tests/delegation_commands.rs +++ b/tuftool/tests/delegation_commands.rs @@ -3,19 +3,20 @@ mod test_utils; +use crate::test_utils::days; use assert_cmd::Command; -use chrono::{Duration, Utc}; +use chrono::Utc; use std::path::Path; use tempfile::TempDir; use test_utils::dir_url; use tough::{RepositoryLoader, TargetName}; fn create_repo>(repo_dir: P) { - let timestamp_expiration = Utc::now().checked_add_signed(Duration::days(1)).unwrap(); + let timestamp_expiration = Utc::now().checked_add_signed(days(1)).unwrap(); let timestamp_version: u64 = 31; - let snapshot_expiration = Utc::now().checked_add_signed(Duration::days(2)).unwrap(); + let snapshot_expiration = Utc::now().checked_add_signed(days(2)).unwrap(); let snapshot_version: u64 = 25; - let targets_expiration = Utc::now().checked_add_signed(Duration::days(3)).unwrap(); + let targets_expiration = Utc::now().checked_add_signed(days(3)).unwrap(); let targets_version: u64 = 17; let targets_input_dir = test_utils::test_data() .join("tuf-reference-impl") @@ -64,18 +65,18 @@ async fn create_add_role_command() { let repo_dir = TempDir::new().unwrap(); // Set new expiration dates and version numbers for the update command - let new_timestamp_expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let new_timestamp_expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let new_timestamp_version: u64 = 310; - let new_snapshot_expiration = Utc::now().checked_add_signed(Duration::days(5)).unwrap(); + let new_snapshot_expiration = Utc::now().checked_add_signed(days(5)).unwrap(); let new_snapshot_version: u64 = 250; - let new_targets_expiration = Utc::now().checked_add_signed(Duration::days(6)).unwrap(); + let new_targets_expiration = Utc::now().checked_add_signed(days(6)).unwrap(); let new_targets_version: u64 = 170; // Create a repo using tuftool and the reference tuf implementation data create_repo(repo_dir.path()); // Set new expiration date for the new role - let expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let metadata_base_url = &dir_url(repo_dir.path().join("metadata")); let meta_out = TempDir::new().unwrap(); @@ -264,16 +265,16 @@ async fn update_target_command() { let repo_dir = TempDir::new().unwrap(); // Set new expiration dates and version numbers for the update command - let new_timestamp_expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let new_timestamp_expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let new_timestamp_version: u64 = 310; - let new_snapshot_expiration = Utc::now().checked_add_signed(Duration::days(5)).unwrap(); + let new_snapshot_expiration = Utc::now().checked_add_signed(days(5)).unwrap(); let new_snapshot_version: u64 = 250; // Create a repo using tuftool and the reference tuf implementation data create_repo(repo_dir.path()); // Set new expiration date for the new role - let expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let metadata_base_url = &dir_url(repo_dir.path().join("metadata")); let meta_out = TempDir::new().unwrap(); @@ -370,11 +371,11 @@ async fn update_target_command() { // update repo with new metadata // Set new expiration dates and version numbers for the update command - let new_timestamp_expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let new_timestamp_expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let new_timestamp_version: u64 = 310; - let new_snapshot_expiration = Utc::now().checked_add_signed(Duration::days(5)).unwrap(); + let new_snapshot_expiration = Utc::now().checked_add_signed(days(5)).unwrap(); let new_snapshot_version: u64 = 250; - let new_targets_expiration = Utc::now().checked_add_signed(Duration::days(6)).unwrap(); + let new_targets_expiration = Utc::now().checked_add_signed(days(6)).unwrap(); let new_targets_version: u64 = 170; let update_out = TempDir::new().unwrap(); @@ -446,11 +447,11 @@ async fn add_key_command() { create_repo(repo_dir.path()); // Set new expiration dates and version numbers for the update command - let new_timestamp_expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let new_timestamp_expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let new_timestamp_version: u64 = 310; - let new_snapshot_expiration = Utc::now().checked_add_signed(Duration::days(5)).unwrap(); + let new_snapshot_expiration = Utc::now().checked_add_signed(days(5)).unwrap(); let new_snapshot_version: u64 = 250; - let expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let metadata_base_url = &dir_url(repo_dir.path().join("metadata")); let meta_out = TempDir::new().unwrap(); @@ -694,11 +695,11 @@ fn remove_key_command() { create_repo(repo_dir.path()); // Set new expiration dates and version numbers for the update command - let new_timestamp_expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let new_timestamp_expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let new_timestamp_version: u64 = 310; - let new_snapshot_expiration = Utc::now().checked_add_signed(Duration::days(5)).unwrap(); + let new_snapshot_expiration = Utc::now().checked_add_signed(days(5)).unwrap(); let new_snapshot_version: u64 = 250; - let expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let metadata_base_url = &dir_url(repo_dir.path().join("metadata")); let meta_out = TempDir::new().unwrap(); @@ -897,11 +898,11 @@ async fn remove_role_command() { create_repo(repo_dir.path()); // Set new expiration dates and version numbers for the update command - let new_timestamp_expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let new_timestamp_expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let new_timestamp_version: u64 = 310; - let new_snapshot_expiration = Utc::now().checked_add_signed(Duration::days(5)).unwrap(); + let new_snapshot_expiration = Utc::now().checked_add_signed(days(5)).unwrap(); let new_snapshot_version: u64 = 250; - let expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let metadata_base_url = &dir_url(repo_dir.path().join("metadata")); let meta_out = TempDir::new().unwrap(); @@ -1033,11 +1034,11 @@ async fn remove_role_command() { // update repo with new metadata // Set new expiration dates and version numbers for the update command - let new_timestamp_expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let new_timestamp_expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let new_timestamp_version: u64 = 310; - let new_snapshot_expiration = Utc::now().checked_add_signed(Duration::days(5)).unwrap(); + let new_snapshot_expiration = Utc::now().checked_add_signed(days(5)).unwrap(); let new_snapshot_version: u64 = 250; - let new_targets_expiration = Utc::now().checked_add_signed(Duration::days(6)).unwrap(); + let new_targets_expiration = Utc::now().checked_add_signed(days(6)).unwrap(); let new_targets_version: u64 = 170; let update_out = TempDir::new().unwrap(); @@ -1106,11 +1107,11 @@ async fn remove_role_command() { // update repo with new metadata // Set new expiration dates and version numbers for the update command - let new_timestamp_expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let new_timestamp_expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let new_timestamp_version: u64 = 310; - let new_snapshot_expiration = Utc::now().checked_add_signed(Duration::days(5)).unwrap(); + let new_snapshot_expiration = Utc::now().checked_add_signed(days(5)).unwrap(); let new_snapshot_version: u64 = 250; - let new_targets_expiration = Utc::now().checked_add_signed(Duration::days(6)).unwrap(); + let new_targets_expiration = Utc::now().checked_add_signed(days(6)).unwrap(); let new_targets_version: u64 = 170; let update_out = TempDir::new().unwrap(); @@ -1174,11 +1175,11 @@ async fn remove_role_recursive_command() { create_repo(repo_dir.path()); // Set new expiration dates and version numbers for the update command - let new_timestamp_expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let new_timestamp_expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let new_timestamp_version: u64 = 310; - let new_snapshot_expiration = Utc::now().checked_add_signed(Duration::days(5)).unwrap(); + let new_snapshot_expiration = Utc::now().checked_add_signed(days(5)).unwrap(); let new_snapshot_version: u64 = 250; - let expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let metadata_base_url = &dir_url(repo_dir.path().join("metadata")); let meta_out = TempDir::new().unwrap(); @@ -1309,11 +1310,11 @@ async fn remove_role_recursive_command() { // update repo with new metadata // Set new expiration dates and version numbers for the update command - let new_timestamp_expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let new_timestamp_expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let new_timestamp_version: u64 = 310; - let new_snapshot_expiration = Utc::now().checked_add_signed(Duration::days(5)).unwrap(); + let new_snapshot_expiration = Utc::now().checked_add_signed(days(5)).unwrap(); let new_snapshot_version: u64 = 250; - let new_targets_expiration = Utc::now().checked_add_signed(Duration::days(6)).unwrap(); + let new_targets_expiration = Utc::now().checked_add_signed(days(6)).unwrap(); let new_targets_version: u64 = 170; let update_out = TempDir::new().unwrap(); @@ -1383,11 +1384,11 @@ async fn remove_role_recursive_command() { // update repo with new metadata // Set new expiration dates and version numbers for the update command - let new_timestamp_expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let new_timestamp_expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let new_timestamp_version: u64 = 310; - let new_snapshot_expiration = Utc::now().checked_add_signed(Duration::days(5)).unwrap(); + let new_snapshot_expiration = Utc::now().checked_add_signed(days(5)).unwrap(); let new_snapshot_version: u64 = 250; - let new_targets_expiration = Utc::now().checked_add_signed(Duration::days(6)).unwrap(); + let new_targets_expiration = Utc::now().checked_add_signed(days(6)).unwrap(); let new_targets_version: u64 = 170; let update_out = TempDir::new().unwrap(); @@ -1455,18 +1456,18 @@ async fn dubious_role_name() { let repo_dir = TempDir::new().unwrap(); // Set new expiration dates and version numbers for the update command - let new_timestamp_expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let new_timestamp_expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let new_timestamp_version: u64 = 310; - let new_snapshot_expiration = Utc::now().checked_add_signed(Duration::days(5)).unwrap(); + let new_snapshot_expiration = Utc::now().checked_add_signed(days(5)).unwrap(); let new_snapshot_version: u64 = 250; - let new_targets_expiration = Utc::now().checked_add_signed(Duration::days(6)).unwrap(); + let new_targets_expiration = Utc::now().checked_add_signed(days(6)).unwrap(); let new_targets_version: u64 = 170; // Create a repo using tuftool and the reference tuf implementation data create_repo(repo_dir.path()); // Set new expiration date for the new role - let expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let metadata_base_url = &dir_url(repo_dir.path().join("metadata")); let meta_out = TempDir::new().unwrap(); diff --git a/tuftool/tests/test_utils.rs b/tuftool/tests/test_utils.rs index 931d2bc9..4e3f31e1 100644 --- a/tuftool/tests/test_utils.rs +++ b/tuftool/tests/test_utils.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: MIT OR Apache-2.0 use assert_cmd::Command; -use chrono::{Duration, Utc}; +use chrono::{TimeDelta, Utc}; use std::path::{Path, PathBuf}; use tough::IntoVec; use url::Url; @@ -33,15 +33,20 @@ where stream.into_vec().await.unwrap() } +#[allow(unused)] +pub fn days(value: i64) -> TimeDelta { + TimeDelta::try_days(value).unwrap() +} + /// Creates a repository with expired timestamp metadata. #[allow(unused)] pub fn create_expired_repo>(repo_dir: P) { // Expired time stamp - let timestamp_expiration = Utc::now().checked_add_signed(Duration::days(-1)).unwrap(); + let timestamp_expiration = Utc::now().checked_add_signed(days(-1)).unwrap(); let timestamp_version: u64 = 31; - let snapshot_expiration = Utc::now().checked_add_signed(Duration::days(2)).unwrap(); + let snapshot_expiration = Utc::now().checked_add_signed(days(2)).unwrap(); let snapshot_version: u64 = 25; - let targets_expiration = Utc::now().checked_add_signed(Duration::days(3)).unwrap(); + let targets_expiration = Utc::now().checked_add_signed(days(3)).unwrap(); let targets_version: u64 = 17; let targets_input_dir = test_data().join("tuf-reference-impl").join("targets"); let root_json = test_data().join("simple-rsa").join("root.json"); diff --git a/tuftool/tests/update_command.rs b/tuftool/tests/update_command.rs index 026b35e8..efb1b217 100644 --- a/tuftool/tests/update_command.rs +++ b/tuftool/tests/update_command.rs @@ -3,20 +3,21 @@ mod test_utils; +use crate::test_utils::days; use assert_cmd::assert::Assert; use assert_cmd::Command; -use chrono::{DateTime, Duration, Utc}; +use chrono::{DateTime, Utc}; use std::path::Path; use tempfile::TempDir; use test_utils::dir_url; use tough::{RepositoryLoader, TargetName}; fn create_repo>(repo_dir: P) { - let timestamp_expiration = Utc::now().checked_add_signed(Duration::days(1)).unwrap(); + let timestamp_expiration = Utc::now().checked_add_signed(days(1)).unwrap(); let timestamp_version: u64 = 31; - let snapshot_expiration = Utc::now().checked_add_signed(Duration::days(2)).unwrap(); + let snapshot_expiration = Utc::now().checked_add_signed(days(2)).unwrap(); let snapshot_version: u64 = 25; - let targets_expiration = Utc::now().checked_add_signed(Duration::days(3)).unwrap(); + let targets_expiration = Utc::now().checked_add_signed(days(3)).unwrap(); let targets_version: u64 = 17; let targets_input_dir = test_utils::test_data() .join("tuf-reference-impl") @@ -65,11 +66,11 @@ async fn update_command_without_new_targets() { create_repo(repo_dir.path()); // Set new expiration dates and version numbers for the update command - let new_timestamp_expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let new_timestamp_expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let new_timestamp_version: u64 = 310; - let new_snapshot_expiration = Utc::now().checked_add_signed(Duration::days(5)).unwrap(); + let new_snapshot_expiration = Utc::now().checked_add_signed(days(5)).unwrap(); let new_snapshot_version: u64 = 250; - let new_targets_expiration = Utc::now().checked_add_signed(Duration::days(6)).unwrap(); + let new_targets_expiration = Utc::now().checked_add_signed(days(6)).unwrap(); let new_targets_version: u64 = 170; let metadata_base_url = &dir_url(repo_dir.path().join("metadata")); let update_out = TempDir::new().unwrap(); @@ -137,11 +138,11 @@ async fn update_command_with_new_targets() { create_repo(repo_dir.path()); // Set new expiration dates and version numbers for the update command - let new_timestamp_expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let new_timestamp_expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let new_timestamp_version: u64 = 310; - let new_snapshot_expiration = Utc::now().checked_add_signed(Duration::days(5)).unwrap(); + let new_snapshot_expiration = Utc::now().checked_add_signed(days(5)).unwrap(); let new_snapshot_version: u64 = 250; - let new_targets_expiration = Utc::now().checked_add_signed(Duration::days(6)).unwrap(); + let new_targets_expiration = Utc::now().checked_add_signed(days(6)).unwrap(); let new_targets_version: u64 = 170; let new_targets_input_dir = test_utils::test_data().join("targets"); let metadata_base_url = &dir_url(repo_dir.path().join("metadata")); @@ -299,11 +300,11 @@ fn updates_expired_repo( let root_json = test_utils::test_data().join("simple-rsa").join("root.json"); let root_key = test_utils::test_data().join("snakeoil.pem"); // Set expiration dates and version numbers for the update command - let timestamp_expiration = Utc::now().checked_add_signed(Duration::days(4)).unwrap(); + let timestamp_expiration = Utc::now().checked_add_signed(days(4)).unwrap(); let timestamp_version: u64 = 310; - let snapshot_expiration = Utc::now().checked_add_signed(Duration::days(5)).unwrap(); + let snapshot_expiration = Utc::now().checked_add_signed(days(5)).unwrap(); let snapshot_version: u64 = 250; - let targets_expiration = Utc::now().checked_add_signed(Duration::days(6)).unwrap(); + let targets_expiration = Utc::now().checked_add_signed(days(6)).unwrap(); let targets_version: u64 = 170; let metadata_base_url = &test_utils::dir_url(repo_dir.path().join("metadata")); let mut cmd = Command::cargo_bin("tuftool").unwrap(); From aecce91d27b77b9b417021849e03fca72ac4fdba Mon Sep 17 00:00:00 2001 From: Matthew James Briggs Date: Fri, 8 Mar 2024 13:13:15 -0800 Subject: [PATCH 2/6] bump versions for release --- Cargo.lock | 8 ++++---- tough-kms/Cargo.toml | 6 +++--- tough-ssm/Cargo.toml | 4 ++-- tough/Cargo.toml | 2 +- tuftool/Cargo.toml | 10 +++++----- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9ba9cd1c..e745ed7e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2545,7 +2545,7 @@ dependencies = [ [[package]] name = "tough" -version = "0.16.0" +version = "0.17.0" dependencies = [ "async-recursion", "async-trait", @@ -2582,7 +2582,7 @@ dependencies = [ [[package]] name = "tough-kms" -version = "0.8.0" +version = "0.9.0" dependencies = [ "aws-config", "aws-sdk-kms", @@ -2603,7 +2603,7 @@ dependencies = [ [[package]] name = "tough-ssm" -version = "0.11.0" +version = "0.12.0" dependencies = [ "aws-config", "aws-sdk-ssm", @@ -2756,7 +2756,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tuftool" -version = "0.10.2" +version = "0.10.3" dependencies = [ "assert_cmd", "aws-config", diff --git a/tough-kms/Cargo.toml b/tough-kms/Cargo.toml index c0d0b6ab..c453b479 100644 --- a/tough-kms/Cargo.toml +++ b/tough-kms/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tough-kms" -version = "0.8.0" +version = "0.9.0" description = "Implements AWS KMS as a key source for TUF signing keys" authors = ["Shailesh Gothi "] license = "MIT OR Apache-2.0" @@ -14,7 +14,7 @@ aws-sdk-rust = ["aws-sdk-rust-rustls"] aws-sdk-rust-rustls = ["aws-config/rustls", "aws-sdk-kms/rustls"] [dependencies] -tough = { version = "0.16", path = "../tough", features = ["http"] } +tough = { version = "0.17", path = "../tough", features = ["http"] } ring = { version = "0.17", features = ["std"] } aws-sdk-kms = "1" aws-config = "1" @@ -23,7 +23,7 @@ tokio = { version = "1", features = ["fs", "io-util", "time", "macros", "rt-mult pem = "3" [dev-dependencies] -aws-smithy-runtime = {version = "1", features = ["test-util"]} +aws-smithy-runtime = { version = "1", features = ["test-util"] } aws-smithy-http = "0.60" aws-smithy-types = "1" base64 = "0.22" diff --git a/tough-ssm/Cargo.toml b/tough-ssm/Cargo.toml index de8f563a..d0f0b996 100644 --- a/tough-ssm/Cargo.toml +++ b/tough-ssm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tough-ssm" -version = "0.11.0" +version = "0.12.0" description = "Implements AWS SSM as a key source for TUF signing keys" authors = ["Zac Mrowicki "] license = "MIT OR Apache-2.0" @@ -14,7 +14,7 @@ aws-sdk-rust = ["aws-sdk-rust-rustls"] aws-sdk-rust-rustls = ["aws-config/rustls", "aws-sdk-ssm/rustls"] [dependencies] -tough = { version = "0.16", path = "../tough", features = ["http"] } +tough = { version = "0.17", path = "../tough", features = ["http"] } aws-sdk-ssm = "1" aws-config = "1" snafu = { version = "0.8", features = ["backtraces-impl-backtrace-crate"] } diff --git a/tough/Cargo.toml b/tough/Cargo.toml index 70031998..3accaa56 100644 --- a/tough/Cargo.toml +++ b/tough/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tough" -version = "0.16.0" +version = "0.17.0" description = "The Update Framework (TUF) repository client" authors = ["iliana destroyer of worlds "] license = "MIT OR Apache-2.0" diff --git a/tuftool/Cargo.toml b/tuftool/Cargo.toml index 5fe9df8e..993350c3 100644 --- a/tuftool/Cargo.toml +++ b/tuftool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tuftool" -version = "0.10.2" +version = "0.10.3" description = "Utility for creating and signing The Update Framework (TUF) repositories" authors = ["iliana destroyer of worlds "] license = "MIT OR Apache-2.0" @@ -12,7 +12,7 @@ edition = "2018" integ = [] default = ["aws-sdk-rust"] aws-sdk-rust = ["aws-sdk-rust-rustls"] -aws-sdk-rust-rustls = ["aws-config/rustls", "aws-sdk-ssm/rustls", "aws-sdk-kms/rustls",] +aws-sdk-rust-rustls = ["aws-config/rustls", "aws-sdk-ssm/rustls", "aws-sdk-kms/rustls", ] [dependencies] aws-config = "1" @@ -34,9 +34,9 @@ simplelog = "0.12" snafu = { version = "0.8", features = ["backtraces-impl-backtrace-crate"] } tempfile = "3" tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] } -tough = { version = "0.16", path = "../tough", features = ["http"] } -tough-kms = { version = "0.8", path = "../tough-kms" } -tough-ssm = { version = "0.11", path = "../tough-ssm" } +tough = { version = "0.17", path = "../tough", features = ["http"] } +tough-kms = { version = "0.9", path = "../tough-kms" } +tough-ssm = { version = "0.12", path = "../tough-ssm" } url = "2" walkdir = "2" From e17259897989b72a7304b693b1b7efec16a2e02f Mon Sep 17 00:00:00 2001 From: Matthew James Briggs Date: Fri, 8 Mar 2024 13:16:34 -0800 Subject: [PATCH 3/6] workspace resolver 2 --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 0ed642f0..0ee3e0ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" members = [ "olpc-cjson", "tough", From 572233af7622e81154555b00261291b31e944712 Mon Sep 17 00:00:00 2001 From: Matthew James Briggs Date: Fri, 8 Mar 2024 15:26:15 -0800 Subject: [PATCH 4/6] clippy fix --- tough/src/schema/decoded.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tough/src/schema/decoded.rs b/tough/src/schema/decoded.rs index a8655640..88a5b095 100644 --- a/tough/src/schema/decoded.rs +++ b/tough/src/schema/decoded.rs @@ -227,7 +227,7 @@ impl Eq for Decoded {} impl PartialOrd for Decoded { fn partial_cmp(&self, other: &Self) -> Option { - self.bytes.partial_cmp(&other.bytes) + Some(self.cmp(other)) } } From baeec6a7e623b3119e550638a8f69f6aefaec187 Mon Sep 17 00:00:00 2001 From: Matthew James Briggs Date: Fri, 8 Mar 2024 13:32:56 -0800 Subject: [PATCH 5/6] update changelogs --- tough-kms/CHANGELOG.md | 8 +++++++- tough-ssm/CHANGELOG.md | 10 ++++++++-- tough/CHANGELOG.md | 14 ++++++++++++-- tuftool/CHANGELOG.md | 10 +++++++++- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/tough-kms/CHANGELOG.md b/tough-kms/CHANGELOG.md index 21518ef2..4796759b 100644 --- a/tough-kms/CHANGELOG.md +++ b/tough-kms/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.9.0] - 2024-03-15 + +### Changes +- Dependency updates + ## [0.8.0] - 2023-12-05 ### Changes @@ -128,7 +133,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Everything! -[Unreleased]: https://github.com/awslabs/tough/compare/tough-kms-v0.8.0...develop +[Unreleased]: https://github.com/awslabs/tough/compare/tough-kms-v0.9.0...develop +[0.9.0]: https://github.com/awslabs/tough/compare/tough-kms-v0.8.0...tough-kms-v0.9.0 [0.8.0]: https://github.com/awslabs/tough/compare/tough-kms-v0.7.0...tough-kms-v0.8.0 [0.7.0]: https://github.com/awslabs/tough/compare/tough-kms-v0.6.0...tough-kms-v0.7.0 [0.6.0]: https://github.com/awslabs/tough/compare/tough-kms-v0.5.0...tough-kms-v0.6.0 diff --git a/tough-ssm/CHANGELOG.md b/tough-ssm/CHANGELOG.md index 95a9f00d..56301a8b 100644 --- a/tough-ssm/CHANGELOG.md +++ b/tough-ssm/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.12.0] - 2024-03-15 + +### Changes +- Dependency updates + ## [0.11.0] - 2023-12-06 ### Changes @@ -136,8 +141,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Everything! -[Unreleased]: https://github.com/awslabs/tough/compare/tough-ssm-v0.11.0...develop -[0.10.0]: https://github.com/awslabs/tough/compare/tough-ssm-v0.10.0...tough-ssm-v0.11.0 +[Unreleased]: https://github.com/awslabs/tough/compare/tough-ssm-v0.12.0...develop +[0.12.0]: https://github.com/awslabs/tough/compare/tough-ssm-v0.11.0...tough-ssm-v0.12.0 +[0.11.0]: https://github.com/awslabs/tough/compare/tough-ssm-v0.10.0...tough-ssm-v0.11.0 [0.10.0]: https://github.com/awslabs/tough/compare/tough-ssm-v0.9.0...tough-ssm-v0.10.0 [0.9.0]: https://github.com/awslabs/tough/compare/tough-ssm-v0.8.0...tough-ssm-v0.9.0 [0.8.0]: https://github.com/awslabs/tough/compare/tough-ssm-v0.7.2...tough-ssm-v0.8.0 diff --git a/tough/CHANGELOG.md b/tough/CHANGELOG.md index 68d356d1..01cd1a24 100644 --- a/tough/CHANGELOG.md +++ b/tough/CHANGELOG.md @@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.17.0] - 2024-03-15 +### Fixes +- Fix a bug in ECDSA parsing (thanks @Xynnn007) [#737] + +### Changes +- Dependency updates + +[#737]: https://github.com/awslabs/tough/pull/737 + ## [0.16.0] - 2023-12-06 ### Changes - Dependency updates @@ -251,8 +260,9 @@ For changes that require modification of calling code see #120 and #121. ### Added - Everything! -[Unreleased]: https://github.com/awslabs/tough/compare/tough-v0.16.0...develop -[0.15.0]: https://github.com/awslabs/tough/compare/tough-v0.15.0...tough-v0.16.0 +[Unreleased]: https://github.com/awslabs/tough/compare/tough-v0.17.0...develop +[0.17.0]: https://github.com/awslabs/tough/compare/tough-v0.16.0...tough-v0.17.0 +[0.16.0]: https://github.com/awslabs/tough/compare/tough-v0.15.0...tough-v0.16.0 [0.15.0]: https://github.com/awslabs/tough/compare/tough-v0.14.0...tough-v0.15.0 [0.14.0]: https://github.com/awslabs/tough/compare/tough-v0.13.0...tough-v0.14.0 [0.13.0]: https://github.com/awslabs/tough/compare/tough-v0.12.5...tough-v0.13.0 diff --git a/tuftool/CHANGELOG.md b/tuftool/CHANGELOG.md index de7c6271..3a707485 100644 --- a/tuftool/CHANGELOG.md +++ b/tuftool/CHANGELOG.md @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.10.3] - 2024-03-15 +### Changes +- Update Clap v4 deprecations (thanks @kdnakt) [#750] +- Dependency updates + +[#750]: https://github.com/awslabs/tough/pull/750 + ## [0.10.2] - 2023-12-06 ### Fixes - Fix a bug in `tuftool root gen-rsa-key` [#729] @@ -231,7 +238,8 @@ Major update: much of the logic in `tuftool` has been factored out and added to ### Added - Everything! -[Unreleased]: https://github.com/awslabs/tough/compare/tuftool-v0.10.2...develop +[Unreleased]: https://github.com/awslabs/tough/compare/tuftool-v0.10.3...develop +[0.10.3]: https://github.com/awslabs/tough/compare/tuftool-v0.10.2...tuftool-v0.10.3 [0.10.2]: https://github.com/awslabs/tough/compare/tuftool-v0.10.1...tuftool-v0.10.2 [0.10.1]: https://github.com/awslabs/tough/compare/tuftool-v0.10.0...tuftool-v0.10.1 [0.10.0]: https://github.com/awslabs/tough/compare/tuftool-v0.9.0...tuftool-v0.10.0 From 1b6bafeb2b4ef791095b5ea8ed2ca82a2cc4b557 Mon Sep 17 00:00:00 2001 From: Matthew James Briggs Date: Fri, 8 Mar 2024 13:48:31 -0800 Subject: [PATCH 6/6] update github actions rust version --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 749ee0f7..224915c5 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -33,7 +33,7 @@ jobs: key: ${{ hashFiles('.github/cache_bust') }}-${{ runner.os }}-${{ matrix.make_target }}-${{ hashFiles('**/Cargo.lock') }} restore-keys: | ${{ hashFiles('.github/cache_bust') }}-${{ runner.os }}-${{ matrix.make_target }} - - run: rustup default 1.71.1 + - run: rustup default 1.76.0 - run: rustup component add rustfmt - run: rustup component add clippy - run: make ${{ matrix.make_target }}