Skip to content

experimental(tls): change the TLS provider to rustls-rustcrypto #1343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nabetti1720 wants to merge 1 commit into from
Closed

experimental(tls): change the TLS provider to rustls-rustcrypto #1343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
762 changes: 518 additions & 244 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion libs/llrt_numbers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ryu = { version = "1", default-features = false }
[dev-dependencies]
criterion = { version = "0.8", default-features = false }
llrt_test = { version = "0.7.0-beta", path = "../llrt_test" }
rand = { version = "0.10.0-rc.5", features = ["alloc"], default-features = false }
rand = { version = "0.10.0-rc.8", features = ["alloc"], default-features = false }

[[bench]]
name = "numbers"
Expand Down
2 changes: 1 addition & 1 deletion libs/llrt_numbers/benches/numbers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use criterion::{criterion_group, criterion_main, Criterion};
use llrt_numbers::i64_to_base_n;
use rand::Rng;
use rand::RngExt;
use std::{fmt::Write, hint::black_box};

macro_rules! write_formatted {
Expand Down
2 changes: 1 addition & 1 deletion libs/llrt_numbers/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ fn number_to_string<'js>(
#[cfg(test)]
mod test {

use rand::Rng;
use rand::RngExt;

use crate::{float_to_string, i64_to_base_n};

Expand Down
2 changes: 1 addition & 1 deletion llrt_core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ llrt_utils = { path = "../libs/llrt_utils", features = ["all"] }
once_cell = { version = "1", features = ["std"], default-features = false }
phf = { version = "0.13", default-features = false }
quick-xml = { version = "0.39", default-features = false }
rand = { version = "0.10.0-rc.5", features = [
rand = { version = "0.10.0-rc.8", features = [
"alloc",
"thread_rng",
], default-features = false }
Expand Down
22 changes: 10 additions & 12 deletions modules/llrt_crypto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ llrt_context = { version = "0.7.0-beta", path = "../../libs/llrt_context" }
llrt_encoding = { version = "0.7.0-beta", path = "../../libs/llrt_encoding" }
llrt_utils = { version = "0.7.0-beta", path = "../../libs/llrt_utils", default-features = false }
once_cell = { version = "1", features = ["std"], default-features = false }
rand = { version = "0.10.0-rc.5", features = [
rand = { version = "0.10.0-rc.8", features = [
"std",
"std_rng",
"thread_rng",
Expand All @@ -69,41 +69,39 @@ der = { version = "0.8.0-rc.10", features = [
"derive",
"alloc",
], default-features = false, optional = true }
ecdsa = { version = "0.17.0-rc.9", default-features = false, optional = true }
elliptic-curve = { version = "0.14.0-rc.17", features = [
ecdsa = { version = "0.17.0-rc.14", default-features = false, optional = true }
elliptic-curve = { version = "0.14.0-rc.24", features = [
"alloc",
], default-features = false, optional = true }
llrt_json = { version = "0.7.0-beta", path = "../../libs/llrt_json", optional = true }
md-5 = { version = "0.11.0-rc.3", default-features = false }
rsa = { version = "0.10.0-rc.10", features = [
md-5 = { version = "0.11.0-rc.4", default-features = false }
rsa = { version = "0.10.0-rc.14", features = [
"std",
"sha2",
"encoding",
"os_rng",
], default-features = false, optional = true }
p256 = { version = "0.14.0-rc.1", features = [
p256 = { version = "0.14.0-rc.6", features = [
"ecdh",
"ecdsa",
"pkcs8",
], default-features = false, optional = true }
p384 = { version = "0.14.0-rc.1", features = [
p384 = { version = "0.14.0-rc.6", features = [
"ecdh",
"ecdsa",
"pkcs8",
], default-features = false, optional = true }
p521 = { version = "0.14.0-rc.1", features = [
p521 = { version = "0.14.0-rc.6", features = [
"ecdh",
"ecdsa",
"pkcs8",
], default-features = false, optional = true }

pkcs8 = { version = "0.11.0-rc.8", default-features = false, features = [
pkcs8 = { version = "0.11.0-rc.10", default-features = false, features = [
"alloc",
], optional = true }
spki = { version = "0.8.0-rc.4", features = [
"alloc",
], default-features = false, optional = true }
x25519-dalek = { version = "3.0.0-pre.3", features = [
x25519-dalek = { version = "3.0.0-pre.5", features = [
"static_secrets",
"zeroize",
], default-features = false, optional = true }
Expand Down
2 changes: 1 addition & 1 deletion modules/llrt_crypto/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use llrt_utils::{
result::ResultExt,
};
use once_cell::sync::Lazy;
use rand::Rng;
use rand::RngExt;
use ring::rand::{SecureRandom, SystemRandom};
#[cfg(feature = "subtle-rs")]
use rquickjs::prelude::Async;
Expand Down
3 changes: 2 additions & 1 deletion modules/llrt_crypto/src/subtle/generate_key.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ fn generate_key(ctx: &Ctx<'_>, algorithm: &KeyAlgorithm) -> Result<(Vec<u8>, Vec
},
EllipticCurve::P521 => {
let mut rng = rand::rng();
let key = p521::SecretKey::try_from_rng(&mut rng).or_throw(ctx)?;
#[allow(deprecated)]
let key = p521::SecretKey::random(&mut rng);
let pkcs8 = key.to_pkcs8_der().or_throw(ctx)?;
private_key = pkcs8.as_bytes().into();
public_or_secret_key = key.public_key().to_sec1_bytes().into();
Expand Down
2 changes: 1 addition & 1 deletion modules/llrt_fetch/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ pin-project-lite = { version = "0.2", default-features = false }
percent-encoding = { version = "2", features = [
"std",
], default-features = false }
rand = { version = "0.10.0-rc.5", features = [
rand = { version = "0.10.0-rc.8", features = [
"std",
"thread_rng",
], default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion modules/llrt_fetch/src/form_data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::{

use llrt_buffer::{Blob, File};
use llrt_utils::{class::IteratorDef, object::map_to_entries, result::ResultExt};
use rand::Rng;
use rand::RngExt;
use rquickjs::{
atom::PredefinedAtom, class::Trace, prelude::Opt, Array, Class, Ctx, Exception, Function,
IntoJs, JsLifetime, Result, Value,
Expand Down
2 changes: 1 addition & 1 deletion modules/llrt_net/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ tracing = { version = "0.1", default-features = false }

[dev-dependencies]
llrt_test = { path = "../../libs/llrt_test" }
rand = { version = "0.10.0-rc.5", features = ["alloc"], default-features = false }
rand = { version = "0.10.0-rc.8", features = ["alloc"], default-features = false }
2 changes: 1 addition & 1 deletion modules/llrt_path/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ memchr = { version = "2", default-features = false }
[dev-dependencies]
criterion = { version = "0.8", default-features = false }
once_cell = { version = "1", features = ["std"], default-features = false }
rand = { version = "0.10.0-rc.5", features = [
rand = { version = "0.10.0-rc.8", features = [
"alloc",
"thread_rng",
], default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion modules/llrt_tls/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ native-roots = ["dep:rustls-native-certs"]
once_cell = { version = "1", features = ["std"], default-features = false }
rustls = { version = "0.23", features = [
"std",
"ring",
"tls12",
], default-features = false }
rustls-rustcrypto = { git = "https://github.com/RustCrypto/rustls-rustcrypto.git", version = "0.0.2-alpha" }
webpki-roots = { version = "1", default-features = false, optional = true }
rustls-native-certs = { version = "0.8", default-features = false, optional = true }
tracing = { version = "0.1", default-features = false }
Expand Down
3 changes: 1 addition & 2 deletions modules/llrt_tls/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use std::sync::{Arc, OnceLock};

use once_cell::sync::Lazy;
use rustls::{
crypto::ring,
pki_types::{pem::PemObject, CertificateDer},
ClientConfig, RootCertStore, SupportedProtocolVersion,
};
Expand Down Expand Up @@ -59,7 +58,7 @@ pub struct BuildClientConfigOptions {
pub fn build_client_config(
options: BuildClientConfigOptions,
) -> Result<ClientConfig, Box<dyn std::error::Error + Send + Sync>> {
let provider = Arc::new(ring::default_provider());
let provider = Arc::new(rustls_rustcrypto::provider());
let builder = ClientConfig::builder_with_provider(provider.clone());

// TLS versions
Expand Down