diff --git a/Cargo.lock b/Cargo.lock index 2a3489817a..9006d16df6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -299,12 +299,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - [[package]] name = "bitflags" version = "1.3.2" @@ -2656,22 +2650,6 @@ dependencies = [ "wasm-bindgen-futures", ] -[[package]] -name = "oak_sev_guest" -version = "0.1.0" -dependencies = [ - "aes-gcm", - "bitflags 2.4.1", - "lock_api", - "oak_sev_snp_attestation_report", - "snafu", - "spinning_top", - "static_assertions", - "strum", - "x86_64", - "zerocopy", -] - [[package]] name = "oak_sev_snp_attestation_report" version = "0.0.0" @@ -3671,14 +3649,6 @@ dependencies = [ "unsafe-libyaml", ] -[[package]] -name = "sev_serial" -version = "0.1.0" -dependencies = [ - "oak_sev_guest", - "x86_64", -] - [[package]] name = "sha2" version = "0.10.8" @@ -3752,44 +3722,6 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" -[[package]] -name = "snafu" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d342c51730e54029130d7dc9fd735d28c4cd360f1368c01981d4f03ff207f096" -dependencies = [ - "snafu-derive", -] - -[[package]] -name = "snafu-derive" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080c44971436b1af15d6f61ddd8b543995cf63ab8e677d46b00cc06f4ef267a0" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "snp_measurement" -version = "0.1.0" -dependencies = [ - "anyhow", - "clap", - "env_logger", - "hex", - "log", - "oak_sev_guest", - "sha2", - "static_assertions", - "strum", - "x86_64", - "zerocopy", -] - [[package]] name = "socket2" version = "0.5.5" @@ -4372,12 +4304,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "volatile" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442887c63f2c839b346c192d047a7c87e73d0689c9157b00b53dcc27dd5ea793" - [[package]] name = "vsock" version = "0.5.0" @@ -5027,18 +4953,6 @@ dependencies = [ "spki", ] -[[package]] -name = "x86_64" -version = "0.14.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b835097a84e4457323331ec5d6eb23d096066cbfb215d54096dcb4b2e85f500" -dependencies = [ - "bit_field", - "bitflags 2.4.1", - "rustversion", - "volatile", -] - [[package]] name = "xattr" version = "1.3.1" diff --git a/Cargo.toml b/Cargo.toml index cb7cdb982f..a878de081f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,10 +45,7 @@ members = [ "oak_restricted_kernel_sdk", "oak_session", "oak_session_wasm", - "oak_sev_guest", "oak_sev_snp_attestation_report", - "sev_serial", - "snp_measurement", "stage0_dice", "oak_restricted_kernel_sdk_proc_macro", ] @@ -119,10 +116,8 @@ oak_restricted_kernel_sdk = { path = "./oak_restricted_kernel_sdk" } oak_restricted_kernel_sdk_proc_macro = { path = "./oak_restricted_kernel_sdk_proc_macro" } oak_restricted_kernel_interface = { path = "./oak_restricted_kernel_interface" } oak_session = { path = "./oak_session" } -oak_sev_guest = { path = "./oak_sev_guest", default-features = false } oak_sev_snp_attestation_report = { path = "./oak_sev_snp_attestation_report" } oak_stage0_dice = { path = "./stage0_dice" } -sev_serial = { path = "./sev_serial" } # Common external crates. prost = { version = "*", default-features = false, features = ["prost-derive"] } prost-build = "*" diff --git a/oak_sev_guest/Cargo.toml b/oak_sev_guest/Cargo.toml deleted file mode 100644 index d23694cf4f..0000000000 --- a/oak_sev_guest/Cargo.toml +++ /dev/null @@ -1,24 +0,0 @@ -[package] -name = "oak_sev_guest" -version = "0.1.0" -authors = ["Conrad Grobler "] -edition = "2021" -license = "Apache-2.0" - -[features] -default = ["rust-crypto"] -rust-crypto = ["aes-gcm"] - -[dependencies] -aes-gcm = { version = "*", optional = true, default-features = false, features = [ - "aes", -] } -bitflags = "*" -lock_api = "*" -oak_sev_snp_attestation_report = { workspace = true } -spinning_top = "*" -static_assertions = "*" -snafu = { version = "*", default-features = false } -strum = { version = "*", default-features = false, features = ["derive"] } -zerocopy = { version = "*", features = ["derive"] } -x86_64 = "*" diff --git a/sev_serial/Cargo.toml b/sev_serial/Cargo.toml deleted file mode 100644 index 51fbdead1b..0000000000 --- a/sev_serial/Cargo.toml +++ /dev/null @@ -1,10 +0,0 @@ -[package] -name = "sev_serial" -version = "0.1.0" -authors = ["Conrad Grobler "] -edition = "2021" -license = "Apache-2.0" - -[dependencies] -oak_sev_guest = { workspace = true, default-features = false } -x86_64 = "*" diff --git a/snp_measurement/Cargo.toml b/snp_measurement/Cargo.toml deleted file mode 100644 index 9f18c4a3fb..0000000000 --- a/snp_measurement/Cargo.toml +++ /dev/null @@ -1,19 +0,0 @@ -[package] -name = "snp_measurement" -version = "0.1.0" -authors = ["Conrad Grobler "] -edition = "2021" -license = "Apache-2.0" - -[dependencies] -anyhow = "*" -clap = { version = "*", features = ["derive"] } -env_logger = "*" -hex = "*" -oak_sev_guest = { workspace = true } -log = "*" -sha2 = "*" -static_assertions = "*" -strum = { version = "*", default-features = false, features = ["derive"] } -x86_64 = "*" -zerocopy = "*"