Skip to content

Commit

Permalink
chore: clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
minikin committed Aug 26, 2024
1 parent 149c37d commit 117b191
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 78 deletions.
41 changes: 2 additions & 39 deletions rust/c509-certificate/deny.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[graph]
# cargo-deny is really only ever intended to run on the "normal" tier-1 targets
targets = [
"x86_64-unknown-linux-gnu",
"aarch64-unknown-linux-gnu",
Expand All @@ -23,20 +22,11 @@ ignore = [
multiple-versions = "warn"
wildcards = 'deny'
deny = [
# { crate = "git2", use-instead = "gix" },
{ crate = "openssl", use-instead = "rustls" },
{ crate = "openssl-sys", use-instead = "rustls" },
"libssh2-sys",
# { crate = "cmake", use-instead = "cc" },
# { crate = "windows", reason = "bloated and unnecessary", use-instead = "ideally inline bindings, practically, windows-sys" },
]
skip = [
# { crate = "[email protected]", reason = "https://github.com/seanmonstar/reqwest/pull/2130 should be in the next version" },
# { crate = "[email protected]", reason = "gix 0.59 was yanked, see https://github.com/Byron/gitoxide/issues/1309" },
# { crate = "[email protected]", reason = "strum_macros uses this old version" },
# { crate = "[email protected]", reason = "gix-transport pulls in this old version, as well as a newer version via reqwest" },
# { crate = "[email protected]", reason = "gix-transport pulls in this old version, as well as a newer version via reqwest" },
]
skip = []
skip-tree = [
{ crate = "[email protected]", reason = "a foundational crate for many that bumps far too frequently to ever have a shared version" },
]
Expand All @@ -55,9 +45,7 @@ allow-git = [

[licenses]
version = 2
# Don't warn if a listed license isn't found
unused-allowed-license = "allow"
# We want really high confidence when inferring licenses from text
confidence-threshold = 0.93
allow = [
"MIT",
Expand All @@ -72,11 +60,7 @@ allow = [
"Unicode-3.0",
"MPL-2.0",
]
exceptions = [
#{ allow = ["Zlib"], crate = "tinyvec" },
#{ allow = ["Unicode-DFS-2016"], crate = "unicode-ident" },
#{ allow = ["OpenSSL"], crate = "ring" },
]
exceptions = []

[[licenses.clarify]]
crate = "byte-array-literals"
Expand All @@ -92,24 +76,3 @@ license-files = [{ path = "../LICENSE-MIT", hash = 0x001c7e6c }]
crate = "ring"
expression = "MIT"
license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]

# SPDX considers OpenSSL to encompass both the OpenSSL and SSLeay licenses
# https://spdx.org/licenses/OpenSSL.html
# ISC - Both BoringSSL and ring use this for their new files
# MIT - "Files in third_party/ have their own licenses, as described therein. The MIT
# license, for third_party/fiat, which, unlike other third_party directories, is
# compiled into non-test libraries, is included below."
# OpenSSL - Obviously
#expression = "ISC AND MIT AND OpenSSL"
#license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]

#[[licenses.clarify]]
#crate = "webpki"
#expression = "ISC"
#license-files = [{ path = "LICENSE", hash = 0x001c7e6c }]

# Actually "ISC-style"
#[[licenses.clarify]]
#crate = "rustls-webpki"
#expression = "ISC"
#license-files = [{ path = "LICENSE", hash = 0x001c7e6c }]
42 changes: 3 additions & 39 deletions rust/cbork/deny.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[graph]
# cargo-deny is really only ever intended to run on the "normal" tier-1 targets

targets = [
"x86_64-unknown-linux-gnu",
"aarch64-unknown-linux-gnu",
Expand All @@ -23,20 +23,11 @@ ignore = [
multiple-versions = "warn"
wildcards = 'deny'
deny = [
# { crate = "git2", use-instead = "gix" },
{ crate = "openssl", use-instead = "rustls" },
{ crate = "openssl-sys", use-instead = "rustls" },
"libssh2-sys",
# { crate = "cmake", use-instead = "cc" },
# { crate = "windows", reason = "bloated and unnecessary", use-instead = "ideally inline bindings, practically, windows-sys" },
]
skip = [
# { crate = "[email protected]", reason = "https://github.com/seanmonstar/reqwest/pull/2130 should be in the next version" },
# { crate = "[email protected]", reason = "gix 0.59 was yanked, see https://github.com/Byron/gitoxide/issues/1309" },
# { crate = "[email protected]", reason = "strum_macros uses this old version" },
# { crate = "[email protected]", reason = "gix-transport pulls in this old version, as well as a newer version via reqwest" },
# { crate = "[email protected]", reason = "gix-transport pulls in this old version, as well as a newer version via reqwest" },
]
skip = []
skip-tree = [
{ crate = "[email protected]", reason = "a foundational crate for many that bumps far too frequently to ever have a shared version" },
]
Expand All @@ -55,9 +46,7 @@ allow-git = [

[licenses]
version = 2
# Don't warn if a listed license isn't found
unused-allowed-license = "allow"
# We want really high confidence when inferring licenses from text
confidence-threshold = 0.93
allow = [
"MIT",
Expand All @@ -72,11 +61,7 @@ allow = [
"Unicode-3.0",
"MPL-2.0",
]
exceptions = [
#{ allow = ["Zlib"], crate = "tinyvec" },
#{ allow = ["Unicode-DFS-2016"], crate = "unicode-ident" },
#{ allow = ["OpenSSL"], crate = "ring" },
]
exceptions = []

[[licenses.clarify]]
crate = "byte-array-literals"
Expand All @@ -92,24 +77,3 @@ license-files = [{ path = "../LICENSE-MIT", hash = 0x001c7e6c }]
crate = "ring"
expression = "MIT"
license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]

# SPDX considers OpenSSL to encompass both the OpenSSL and SSLeay licenses
# https://spdx.org/licenses/OpenSSL.html
# ISC - Both BoringSSL and ring use this for their new files
# MIT - "Files in third_party/ have their own licenses, as described therein. The MIT
# license, for third_party/fiat, which, unlike other third_party directories, is
# compiled into non-test libraries, is included below."
# OpenSSL - Obviously
#expression = "ISC AND MIT AND OpenSSL"
#license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]

#[[licenses.clarify]]
#crate = "webpki"
#expression = "ISC"
#license-files = [{ path = "LICENSE", hash = 0x001c7e6c }]

# Actually "ISC-style"
#[[licenses.clarify]]
#crate = "rustls-webpki"
#expression = "ISC"
#license-files = [{ path = "LICENSE", hash = 0x001c7e6c }]
1 change: 1 addition & 0 deletions rust/deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ unknown-registry = "deny"
unknown-git = "deny"

allow-git = [
"https://github.com/input-output-hk/hermes.git",
"https://github.com/input-output-hk/catalyst-pallas.git",
"https://github.com/bytecodealliance/wasmtime",
"https://github.com/aldanor/hdf5-rust",
Expand Down

0 comments on commit 117b191

Please sign in to comment.