Skip to content

Commit 4d2bc3c

Browse files
committed
Merge main
2 parents 2c6c793 + 3cca29f commit 4d2bc3c

File tree

15 files changed

+1009
-553
lines changed

15 files changed

+1009
-553
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ jobs:
3636
run: cargo clippy --workspace -- -D warnings
3737

3838
- name: Run cargo test
39-
run: cargo test --workspace --all-targets
39+
run: cargo test --workspace --all-targets -- --test-threads=1

Cargo.lock

Lines changed: 55 additions & 102 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ members = [".", "dummy-attestation-server"]
33

44
[package]
55
name = "attested-tls-proxy"
6-
description = "An HTTP attested TLS proxy server and client for secure communication with CVM services"
7-
version = "0.1.0"
6+
version = "0.0.1"
87
edition = "2024"
98
license = "MIT"
9+
description = "An HTTP attested TLS proxy server and client for secure communication with CVM services"
1010
repository = "https://github.com/flashbots/attested-tls-proxy"
11+
keywords = ["attested-TLS", "CVM", "TDX"]
1112

1213
[dependencies]
1314
tokio = { version = "1.48.0", features = ["full"] }
@@ -49,16 +50,23 @@ time = "0.3.44"
4950
once_cell = "1.21.3"
5051
axum = "0.8.6"
5152
tower-http = { version = "0.6.7", features = ["fs"] }
53+
tokio-tungstenite = { version = "0.28.0", optional = true }
54+
futures-util = { version = "0.3.31", optional = true }
5255

5356
[dev-dependencies]
5457
rcgen = "0.14.5"
5558
tempfile = "3.23.0"
56-
tdx-quote = { version = "0.0.4", features = ["mock"] }
59+
tdx-quote = { version = "0.0.5", features = ["mock"] }
5760

5861
[features]
59-
default = ["azure"]
62+
default = ["azure", "ws"]
63+
64+
# Adds support for Microsoft Azure attestation generation and verification
6065
azure = ["tss-esapi", "az-tdx-vtpm"]
6166

67+
# Adds websocket support
68+
ws = ["tokio-tungstenite", "futures-util"]
69+
6270
[package.metadata.deb]
6371
maintainer = "Flashbots Team <[email protected]>"
6472
depends = "$auto"

dummy-attestation-server/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ version = "0.1.0"
44
edition = "2024"
55
license = "MIT"
66
publish = false
7+
repository = "https://github.com/flashbots/attested-tls-proxy"
78

89
[dependencies]
910
attested-tls-proxy = { path = ".." }

src/attestation/azure/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! Microsoft Azure Attestation (MAA) evidence generation and verification
1+
//! Microsoft Azure vTPM attestation evidence generation and verification
22
mod ak_certificate;
33
mod nv_index;
44
use ak_certificate::{read_ak_certificate_from_tpm, verify_ak_cert_with_azure_roots};
@@ -245,6 +245,7 @@ impl RsaPubKey {
245245
}
246246
}
247247

248+
/// An error when generating or verifying a Microsoft Azure vTPM attestation
248249
#[derive(Error, Debug)]
249250
pub enum MaaError {
250251
#[error("Report: {0}")]

0 commit comments

Comments
 (0)