Skip to content

Commit

Permalink
remove ring support from rama
Browse files Browse the repository at this point in the history
closes #430
  • Loading branch information
GlenDC committed Feb 22, 2025
1 parent d087c16 commit 4276c0c
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 21 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@ telemetry = ["rama-core/telemetry", "rama-net/telemetry", "rama-http/telemetry"]
compression = ["http", "rama-http/compression"]
tls = ["net", "dep:rama-tls", "rama-net/tls", "rama-http/tls", "rama-http-backend/tls"]
rustls = ["tls", "rama-tls/rustls", "rama-net/rustls", "rama-http-backend/rustls"]
rustls-ring = ["tls", "rama-tls/rustls-ring"]
boring = ["tls", "rama-tls/boring", "rama-net/boring", "rama-http-backend/boring"]
cli = ["dep:base64", "dep:bytes", "dep:hex", "dep:serde_json", "dep:serde_html_form", "dep:tracing", "dep:tokio", "http"]
net = ["dep:rama-net"]
Expand Down
12 changes: 0 additions & 12 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,6 @@ allow = [
"Zlib",
]

[[licenses.clarify]]
crate = "ring"
# 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 }]

[bans]
multiple-versions = "warn"
highlight = "all"
Expand Down
1 change: 0 additions & 1 deletion rama-http-backend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ default = []
tls = ["dep:rama-tls", "rama-net/tls"]
rustls = ["tls", "rama-net/rustls", "rama-tls/rustls"]
boring = ["tls", "rama-net/boring", "rama-tls/boring"]
rustls-ring = ["rustls", "rama-tls/rustls-ring"]

[dependencies]
const_format = { workspace = true }
Expand Down
1 change: 0 additions & 1 deletion rama-net/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ http = ["dep:rama-http-types", "dep:sha2", "dep:itertools", "dep:hex"]
tls = ["dep:hex", "dep:md5", "dep:sha2", "dep:itertools"]
rustls = ["tls", "dep:rustls"]
boring = ["tls", "dep:boring", "dep:nom"]
rustls-ring = ["rustls", "rustls/ring"]
telemetry = ["rama-core/telemetry"]

[dependencies]
Expand Down
1 change: 0 additions & 1 deletion rama-tls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ workspace = true
default = []
rustls = ["dep:rustls", "dep:rustls-native-certs", "dep:rustls-pemfile", "dep:rustls-pki-types", "dep:webpki-roots", "dep:rcgen", "dep:tokio-rustls", "rama-net/rustls"]
boring = ["dep:boring", "dep:tokio-boring", "rama-net/boring", "dep:moka"]
rustls-ring = ["rustls", "tokio-rustls/ring", "rustls/ring", "rama-net/rustls-ring"]

[dependencies]
boring = { workspace = true, optional = true }
Expand Down
4 changes: 0 additions & 4 deletions supply-chain/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -403,10 +403,6 @@ criteria = "safe-to-deploy"
version = "0.8.3"
criteria = "safe-to-deploy"

[[exemptions.ring]]
version = "0.17.8"
criteria = "safe-to-deploy"

[[exemptions.rustc-demangle]]
version = "0.1.24"
criteria = "safe-to-deploy"
Expand Down

0 comments on commit 4276c0c

Please sign in to comment.