From 6f3e8229bb10882688c3ad1b0a76154e61934c77 Mon Sep 17 00:00:00 2001 From: Bob Beck Date: Tue, 14 Mar 2023 09:43:58 -0600 Subject: [PATCH] Rust build cleanup Add Cargo.lock to .gitignore for rust/bssl-crypto and remove generated file Clean up cargo deny warnings and set reasonable starting point in deny.toml Change-Id: I0b925408ab6b7947b1b01282bac803feb769421a Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/57985 Reviewed-by: Nabil Wadih Reviewed-by: David Benjamin Commit-Queue: Bob Beck --- .gitignore | 1 + rust/bssl-crypto/Cargo.lock | 14 -------------- rust/bssl-crypto/deny.toml | 6 ++---- 3 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 rust/bssl-crypto/Cargo.lock diff --git a/.gitignore b/.gitignore index ac0ede846..3e22141d9 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ ssl/test/runner/runner doc/*.html doc/doc.css rust/Cargo.lock +rust/bssl-crypto/Cargo.lock rust/target util/bot/android_ndk diff --git a/rust/bssl-crypto/Cargo.lock b/rust/bssl-crypto/Cargo.lock deleted file mode 100644 index ed7fe34d3..000000000 --- a/rust/bssl-crypto/Cargo.lock +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "bssl-crypto" -version = "0.1.0" -dependencies = [ - "bssl-sys", -] - -[[package]] -name = "bssl-sys" -version = "0.1.0" diff --git a/rust/bssl-crypto/deny.toml b/rust/bssl-crypto/deny.toml index d398485e3..e52104742 100644 --- a/rust/bssl-crypto/deny.toml +++ b/rust/bssl-crypto/deny.toml @@ -78,8 +78,6 @@ unlicensed = "deny" allow = [ "MIT", "Apache-2.0", - "Apache-2.0 WITH LLVM-exception", - "Unicode-DFS-2016", ] # List of explicitly disallowed licenses # See https://spdx.org/licenses/ for list of possible licenses @@ -88,7 +86,7 @@ deny = [ #"Nokia", ] # Lint level for licenses considered copyleft -copyleft = "warn" +copyleft = "deny" # Blanket approval or denial for OSI-approved or FSF Free/Libre licenses # * both - The license will be approved if it is both OSI-approved *AND* FSF # * either - The license will be approved if it is either OSI-approved *OR* FSF @@ -152,7 +150,7 @@ registries = [ # https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html [bans] # Lint level for when multiple versions of the same crate are detected -multiple-versions = "warn" +multiple-versions = "deny" # Lint level for when a crate version requirement is `*` wildcards = "allow" # The graph highlighting used when creating dotgraphs for crates