Skip to content

Restore measurement header injection #154

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

Merged
ameba23 merged 11 commits into from
Apr 22, 2026
Merged

Restore measurement header injection #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
86eabba
Add measurement header injection
ameba23 Mar 23, 2026
d45a353
Fix re-connection bug
ameba23 Mar 23, 2026
7ed43a9
Fully restore measurement header injection
ameba23 Mar 23, 2026
a047837
Use the same reconnect behavior as before
ameba23 Mar 23, 2026
c1ed5f0
Strip measurements headers to avoid them being spoofed
ameba23 Mar 23, 2026
d7aae84
Merge target branch
ameba23 Apr 1, 2026
1e40997
Fmt
ameba23 Apr 1, 2026
312ba83
Update field name following merged dep
ameba23 Apr 1, 2026
7c262f7
Update branch of attested-tls following merging paired PR
ameba23 Apr 22, 2026
f512665
Use aws lc as default crypto provider
ameba23 Apr 22, 2026
735e368
Use aws lc as default crypto provider
ameba23 Apr 22, 2026
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
151 changes: 145 additions & 6 deletions Cargo.lock
View file
Open in desktop

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

11 changes: 6 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ repository = "https://github.com/flashbots/attested-tls-proxy"
keywords = ["attested-TLS", "CVM", "TDX"]

[dependencies]
attested-tls = { git = "https://github.com/flashbots/attested-tls", branch = "peg/attested-tls-crate" }
nested-tls = { git = "https://github.com/flashbots/attested-tls", branch = "peg/attested-tls-crate" }
attestation = { git = "https://github.com/flashbots/attested-tls", branch = "peg/attested-tls-crate" }
attested-tls = { git = "https://github.com/flashbots/attested-tls", branch = "main" }
nested-tls = { git = "https://github.com/flashbots/attested-tls", branch = "main" }
attestation = { git = "https://github.com/flashbots/attested-tls", branch = "main" }
pccs = { git = "https://github.com/flashbots/attested-tls", branch = "main" }
tokio = { version = "1.50.0", features = ["full"] }
tokio-rustls = { version = "0.26.4", default-features = false }
tokio-rustls = { version = "0.26.4", default-features = false, features = ["aws_lc_rs"] }
x509-parser = { version = "0.18.0", features = ["verify"] }
thiserror = "2.0.17"
clap = { version = "4.5.51", features = ["derive", "env"] }
Expand Down Expand Up @@ -47,7 +48,7 @@ pin-project-lite = "0.2.16"
[dev-dependencies]
tempfile = "3.23.0"
tdx-quote = { version = "0.0.5", features = ["mock"] }
attestation = { git = "https://github.com/flashbots/attested-tls", branch = "peg/attested-tls-crate", features = ["mock"] }
attestation = { git = "https://github.com/flashbots/attested-tls", branch = "main", features = ["mock"] }
tokio = { version = "1.48.0", features = ["full"] }
jsonrpsee = { version = "0.26.0", features = ["server"] }

Expand Down
1 change: 1 addition & 0 deletions attestation-provider-server/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ async fn main() -> anyhow::Result<()> {
pccs_url: None,
dump_dcap_quotes: cli.log_dcap_quote,
override_azure_outdated_tcb: false,
internal_pccs: None,
};

let attestation_message =
Expand Down
2 changes: 1 addition & 1 deletion attested-tls/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ keywords = ["attested-TLS", "CVM", "TDX"]

[dependencies]
tokio = { version = "1.48.0", features = ["full"] }
tokio-rustls = { version = "0.26.4", default-features = false }
tokio-rustls = { version = "0.26.4", default-features = false, features = ["aws_lc_rs"] }
sha2 = "0.10.9"
x509-parser = "0.18.0"
thiserror = "2.0.17"
Expand Down
8 changes: 8 additions & 0 deletions attested-tls/src/test_helpers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ use crate::SUPPORTED_ALPN_PROTOCOL_VERSIONS;

pub use attestation::measurements::mock_dcap_measurements;

fn install_crypto_provider() {
let _ = tokio_rustls::rustls::crypto::aws_lc_rs::default_provider().install_default();
}

/// Helper to generate a self-signed certificate for testing
pub fn generate_certificate_chain(
ip: IpAddr,
Expand All @@ -36,6 +40,8 @@ pub fn generate_tls_config(
certificate_chain: Vec<CertificateDer<'static>>,
key: PrivateKeyDer<'static>,
) -> (ServerConfig, ClientConfig) {
install_crypto_provider();

let supported_protocols: Vec<_> = SUPPORTED_ALPN_PROTOCOL_VERSIONS
.into_iter()
.map(|p| p.to_vec())
Expand Down Expand Up @@ -67,6 +73,8 @@ pub fn generate_tls_config_with_client_auth(
bob_certificate_chain: Vec<CertificateDer<'static>>,
bob_key: PrivateKeyDer<'static>,
) -> ((ServerConfig, ClientConfig), (ServerConfig, ClientConfig)) {
install_crypto_provider();

let supported_protocols: Vec<_> = SUPPORTED_ALPN_PROTOCOL_VERSIONS
.into_iter()
.map(|p| p.to_vec())
Expand Down
Loading
Loading