Merge branch 'main' into mm/pgtable

coconut-svsm · Nov 20, 2023 · dc50a07 · dc50a07
2 parents f2da797 + f6a8342
commit dc50a07
Show file tree

Hide file tree

Showing 44 changed files with 3,568 additions and 354 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/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -48,3 +48,6 @@ before allowing them to be committed. It can be installed by running
 ```
 
 from the projects root directory.
+
+For detailed instructions on documentation guidelines please have a look at
+[DOC-GUIDELINES.md](Documentation/DOC-GUIDELINES.md).
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" }