Merge branch 'attestation-report'

coconut-svsm · Nov 20, 2023 · d1fb87d · d1fb87d
2 parents a3da394 + fffd826
commit d1fb87d
Show file tree

Hide file tree

Showing 16 changed files with 1,763 additions and 26 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -3,6 +3,8 @@ target = "x86_64-unknown-none"
 rustflags = [
 	"-C", "force-frame-pointers",
 	"-C", "linker-flavor=ld",
+	"--cfg", "aes_force_soft",
+	"--cfg", "polyval_force_soft",
 ]
 
 [target.x86_64-unknown-linux-gnu]

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,6 +24,7 @@ gdbstub_arch = { version = "0.2.4", optional = true }
 intrusive-collections = "0.9.6"
 log = { version = "0.4.17", features = ["max_level_info", "release_max_level_info"] }
 packit = { git = "https://github.com/coconut-svsm/packit", version = "0.1.0" }
+aes-gcm = { version = "0.10.3", default-features = false, features = ["aes", "alloc"] }
 
 [target."x86_64-unknown-none".dev-dependencies]
 test = { version = "0.1.0", path = "test" }

diff --git a/Makefile b/Makefile
@@ -8,6 +8,12 @@ else
 TARGET_PATH=debug
 endif
 
+ifeq ($(V), 1)
+CARGO_ARGS += -v
+else ifeq ($(V), 2)
+CARGO_ARGS += -vv
+endif
+
 STAGE2_ELF = "target/x86_64-unknown-none/${TARGET_PATH}/stage2"
 KERNEL_ELF = "target/x86_64-unknown-none/${TARGET_PATH}/svsm"
 TEST_KERNEL_ELF = target/x86_64-unknown-none/${TARGET_PATH}/svsm-test