From 0665ac4873d33da4222cd62228640c26ab2c836c Mon Sep 17 00:00:00 2001 From: Yihau Chen Date: Wed, 19 Jun 2024 12:12:57 +0800 Subject: [PATCH 1/2] ci: ignore curve25519-dalek audit temporarily (#1786) ci: ignore curve25519-dalek audit (cherry picked from commit a6bc917f36d80221862e6731fe7dbd261c728be2) # Conflicts: # ci/do-audit.sh --- ci/do-audit.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/do-audit.sh b/ci/do-audit.sh index 0118c84c5f0fec..5eea96498669f1 100755 --- a/ci/do-audit.sh +++ b/ci/do-audit.sh @@ -31,8 +31,13 @@ cargo_audit_ignores=( --ignore RUSTSEC-2022-0093 +<<<<<<< HEAD # mio --ignore RUSTSEC-2024-0019 +======= + # curve25519-dalek + --ignore RUSTSEC-2024-0344 +>>>>>>> a6bc917f36 (ci: ignore curve25519-dalek audit temporarily (#1786)) ) scripts/cargo-for-all-lock-files.sh audit "${cargo_audit_ignores[@]}" | $dep_tree_filter # we want the `cargo audit` exit code, not `$dep_tree_filter`'s From 1c6a8462c89d178e87d73060f2e159a174f785c6 Mon Sep 17 00:00:00 2001 From: steviez Date: Wed, 26 Jun 2024 21:00:00 -0500 Subject: [PATCH 2/2] Merge conflict resolution --- ci/do-audit.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ci/do-audit.sh b/ci/do-audit.sh index 5eea96498669f1..a229e0be83d754 100755 --- a/ci/do-audit.sh +++ b/ci/do-audit.sh @@ -31,13 +31,11 @@ cargo_audit_ignores=( --ignore RUSTSEC-2022-0093 -<<<<<<< HEAD # mio --ignore RUSTSEC-2024-0019 -======= + # curve25519-dalek --ignore RUSTSEC-2024-0344 ->>>>>>> a6bc917f36 (ci: ignore curve25519-dalek audit temporarily (#1786)) ) scripts/cargo-for-all-lock-files.sh audit "${cargo_audit_ignores[@]}" | $dep_tree_filter # we want the `cargo audit` exit code, not `$dep_tree_filter`'s