Skip to content

Commit 68a4b3b

Browse files
authored
switch from ring to aws_lc_rs (#102)
1 parent d2b68e4 commit 68a4b3b

3 files changed

Lines changed: 62 additions & 6 deletions

File tree

Cargo.lock

Lines changed: 57 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ed25519-dalek = { version = "2.1", default-features = false, features = ["digest
2929
libipcc = { git = "https://github.com/oxidecomputer/ipcc-rs", rev = "524eb8f125003dff50b9703900c6b323f00f9e1b" }
3030
pem-rfc7468 = { version = "0.7.0"}
3131
pki-playground = { git = "https://github.com/oxidecomputer/pki-playground", rev = "7600756029ce046a02c6234aa84ce230cc5eaa04" }
32-
rustls = { version = "0.23.10", default-features = false, features = ["std", "ring", "logging"] }
32+
rustls = { version = "0.23.10", default-features = false, features = ["std", "aws_lc_rs", "logging"] }
3333
secrecy = "0.8.0"
3434
serde = { version = "1", default-features = false }
3535
sha2 = "0.10"
@@ -40,7 +40,7 @@ slog-error-chain = { git = "https://github.com/oxidecomputer/slog-error-chain",
4040
slog-term = "2.9.1"
4141
thiserror = "1.0.57"
4242
tokio = {version = "1.38.0", features = ["net", "macros", "rt-multi-thread", "io-util", "sync", "time", "io-std"]}
43-
tokio-rustls = { version = "0.26.0", default-features = false, features = ["ring", "logging"] }
43+
tokio-rustls = { version = "0.26.0", default-features = false, features = ["aws_lc_rs", "logging"] }
4444
toml = "0.8.19"
4545
uuid = { version = "1.10.0", features = ["serde", "v4"] }
4646
x509-cert = { version = "0.2.5" }

tls/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
77
use camino::Utf8PathBuf;
88
use dice_mfg_msgs::PlatformId;
9-
use rustls::crypto::ring::cipher_suite::TLS13_CHACHA20_POLY1305_SHA256;
10-
use rustls::crypto::ring::kx_group::X25519;
9+
use rustls::crypto::aws_lc_rs::cipher_suite::TLS13_CHACHA20_POLY1305_SHA256;
10+
use rustls::crypto::aws_lc_rs::kx_group::X25519;
1111
use rustls::crypto::CryptoProvider;
1212
use slog::error;
1313
use slog_error_chain::SlogInlineError;
@@ -313,7 +313,7 @@ async fn send_msg<T: AsyncWriteExt + Unpin>(
313313
///
314314
/// Only allow CHACHA20_POLY1305_SHA256 for symmetric crypto
315315
pub fn crypto_provider() -> CryptoProvider {
316-
let mut crypto_provider = rustls::crypto::ring::default_provider();
316+
let mut crypto_provider = rustls::crypto::aws_lc_rs::default_provider();
317317
crypto_provider.kx_groups = vec![X25519];
318318
crypto_provider.cipher_suites = vec![TLS13_CHACHA20_POLY1305_SHA256];
319319
crypto_provider

0 commit comments

Comments
 (0)