forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert from aws-lc-rs back to ring

Browse Source
This commit is contained in:
Peter Hayman 2025-04-22 13:49:46 +10:00
parent 46b568641e
commit 56e8a641bf
3 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/bevy_asset/Cargo.toml
View File

@ -14,7 +14,7 @@ keywords = ["bevy"]
file_watcher = ["notify-debouncer-full", "watch"] file_watcher = ["notify-debouncer-full", "watch"]
embedded_watcher = ["file_watcher"] embedded_watcher = ["file_watcher"]
multi_threaded = ["bevy_tasks/multi_threaded"] multi_threaded = ["bevy_tasks/multi_threaded"]
http_source = ["ureq", "rustls"] http_source = ["ureq"]
http_source_cache = [] http_source_cache = []
asset_processor = [] asset_processor = []
watch = [] watch = []
@ -70,18 +70,12 @@ uuid = { version = "1.13.1", default-features = false, features = ["js"] }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
notify-debouncer-full = { version = "0.5.0", optional = true } notify-debouncer-full = { version = "0.5.0", optional = true }
# updating ureq: while ureq is semver stable rustls is not, meaning unlikely but possible breaking changes on minor releases. https://github.com/bevyengine/bevy/pull/16366#issuecomment-2572890794 # updating ureq: while ureq is semver stable, it depends on rustls which is not, meaning unlikely but possible breaking changes on minor releases. https://github.com/bevyengine/bevy/pull/16366#issuecomment-2572890794
ureq = { version = "3.0.4", optional = true, default-features = false, features = [ ureq = { version = "3", optional = true, default-features = false, features = [
"rustls-no-provider",
"gzip", "gzip",
"json", "json",
] } ] }
rustls = { version = "0.23", optional = true, default-features = false, features = [
"aws_lc_rs",
"logging",
"std",
"tls12",
] }
[dev-dependencies] [dev-dependencies]
bevy_log = { path = "../bevy_log", version = "0.16.0-dev" } bevy_log = { path = "../bevy_log", version = "0.16.0-dev" }

14
crates/bevy_asset/src/http_source.rs
View File

@ -81,21 +81,7 @@ async fn get(path: PathBuf) -> Result<Box<dyn Reader>, AssetReaderError> {
use ureq::Agent; use ureq::Agent;
static AGENT: LazyLock<Agent> = LazyLock::new(|| { static AGENT: LazyLock<Agent> = LazyLock::new(|| {
use alloc::sync::Arc;
use ureq::{
tls::{TlsConfig, TlsProvider},
Agent,
};
let crypto = Arc::new(rustls::crypto::aws_lc_rs::default_provider());
Agent::config_builder() Agent::config_builder()
.tls_config(
TlsConfig::builder()
.provider(TlsProvider::Rustls)
// requires rustls or rustls-no-provider feature
.unversioned_rustls_crypto_provider(crypto)
.build(),
)
.build() .build()
.new_agent() .new_agent()
}); });

1
deny.toml
View File

@ -20,7 +20,6 @@ allow = [
"MIT-0", "MIT-0",
"MPL-2.0", "MPL-2.0",
"Unlicense", "Unlicense",
"OpenSSL",
"Zlib", "Zlib",
] ]