Skip to content

Commit

Permalink
Remove Dioxus CLI NASM dependency #2666 (#2682)
Browse files Browse the repository at this point in the history
* fix issue with AWS-LC-SYS

* after mergo of manganis revert back to original

---------

Co-authored-by: Oliver Schnabl <oliver.schnabl@drei.com>
Co-authored-by: Jonathan Kelley <jkelleyrtp@gmail.com>
  • Loading branch information
3 people authored Jul 23, 2024
1 parent c7c0f44 commit c6126f6
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 138 deletions.
135 changes: 0 additions & 135 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ http = "1.0.0"
notify = { version = "6.1.1" }
tower-http = "0.5.2"
hyper = "1.0.0"
hyper-rustls = "0.27.2"
hyper-rustls = { version= "0.27.2", default-features = false , features=["native-tokio","http1","tls12","logging","ring"]}
serde_json = "1.0.61"
serde = "1.0.61"
syn = "2.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ anyhow = "1"
hyper = { workspace = true }
hyper-util = "0.1.3"
hyper-rustls = { workspace = true }
rustls = "0.23.11"
rustls = {version="0.23.11", default-features=false, features =["logging","std","tls12","ring"]}
subprocess = "0.2.9"
rayon = "1.8.0"
futures-channel = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/serve/proxy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct ProxyClient {

impl ProxyClient {
fn new(url: Uri) -> Self {
let _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
let _ = rustls::crypto::ring::default_provider().install_default();
let https = hyper_rustls::HttpsConnectorBuilder::new()
.with_native_roots()
.unwrap()
Expand Down

0 comments on commit c6126f6

Please sign in to comment.