From c82c7500914cfc10eaf5498e2f42ef0e9a9ae13c Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 1 Mar 2021 22:30:03 +0000
Subject: [PATCH] Fixes for latest RustSec Audit manifest (bp #15601) (#15605)

* Add RUSTSEC-2020-0146 to audit ignores

(cherry picked from commit 85252777a62e2d1f29cbe91843257159fb7fb232)

# Conflicts:
#	ci/test-checks.sh

* Pass audit ignores to bpf program audit

(cherry picked from commit ccb604f8c30f26c5d7811bb636d2e80550c2929d)

Co-authored-by: Trent Nelson <trent@solana.com>
---
 ci/test-checks.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ci/test-checks.sh b/ci/test-checks.sh
index 90246448f7..a03cdab942 100755
--- a/ci/test-checks.sh
+++ b/ci/test-checks.sh
@@ -87,12 +87,16 @@ cargo_audit_ignores=(
   # hyper is upgraded on master/v1.6 but not for v1.5
   --ignore RUSTSEC-2021-0020
 
+  # generic-array: arr! macro erases lifetimes
+  #
+  # ed25519-dalek and libsecp256k1 not upgraded for v1.5
+  --ignore RUSTSEC-2020-0146
 )
 _ scripts/cargo-for-all-lock-files.sh +"$rust_stable" audit "${cargo_audit_ignores[@]}"
 
 {
   cd programs/bpf
-  _ "$cargo" stable audit
+  _ "$cargo" stable audit "${cargo_audit_ignores[@]}"
   for project in rust/*/ ; do
     echo "+++ do_bpf_checks $project"
     (