Skip to content
This repository was archived by the owner on Oct 26, 2021. It is now read-only.

Rewrite the SGX backend as an elf loader #478

Merged
merged 6 commits into from
Sep 8, 2021
Merged

Rewrite the SGX backend as an elf loader #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80f466d
Clean up `Component::region()`
npmccallum Aug 24, 2021
eaa5ea4
Split up the SGX shim's handler
npmccallum Sep 7, 2021
dd02cc8
Move all SGX startup assembly into main.rs
npmccallum Sep 7, 2021
b7ccfc7
Add a defensive loop to entry::exit()
npmccallum Sep 7, 2021
41e20f8
Rewrite the SGX backend as an elf loader
npmccallum Sep 7, 2021
0e0008b
Do `cargo update` on shim-sev
npmccallum Sep 7, 2021
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
115 changes: 69 additions & 46 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.

22 changes: 12 additions & 10 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,33 @@ backend-kvm = ["x86_64", "kvm-bindings", "kvm-ioctls"]
backend-sgx = ["sgx"]

[dependencies]
sallyport = { git = "https://github.com/enarx/sallyport", features=[ "asm" ], rev="0d3f139366003b196f9c07c437f86d398c73a18c" }
sgx = { git = "https://github.com/enarx/sgx", rev = "2f8837a3e27d787ad4d420c588bc54b3ff603402", features = ["asm", "crypto"], optional = true }
sgx = { git = "https://github.com/enarx/sgx", rev = "a0b881cc798f3bafb8d603fa1bad6ca7b2a2c740", features = ["asm", "crypto"], optional = true }
sallyport = { git = "https://github.com/enarx/sallyport", rev = "c8ed47f27a09a021048153042af9adcda3fc9deb", features = [ "asm" ] }
x86_64 = { git = "https://github.com/npmccallum/x86_64", branch = "errors", default-features = false, optional = true }
koine = { git = "https://github.com/enarx/koine", optional = true }
x86_64 = { version = "0.11", default-features = false, features = ["stable"], optional = true }
kvm-bindings = { version = "0.4", optional = true }
kvm-ioctls = { version = "0.9", optional = true }
primordial = "0.1"
primordial = { version = "0.3", features = ["alloc"] }
kvm-bindings = { version = "0.5", optional = true }
kvm-ioctls = { version = "0.10", optional = true }
itertools = "0.10"
protobuf = "2.22"
structopt = "0.3"
openssl = "0.10"
iocuddle = "0.1"
ciborium = "0.1"
colorful = "0.2"
mmarinus = "0.2"
flagset = "0.4"
nbytes = "0.1"
anyhow = "1.0"
goblin = "0.4"
libc = "0.2"
lset = "0.1"
protobuf = "2.22"
openssl = "0.10"
lset = "0.2"

[build-dependencies]
cc = "1.0"
walkdir = "2"
protobuf-codegen-pure = "2.25"
sallyport = { git = "https://github.com/enarx/sallyport", features=[ "asm" ], rev="0d3f139366003b196f9c07c437f86d398c73a18c" }
sallyport = { git = "https://github.com/enarx/sallyport", rev = "c8ed47f27a09a021048153042af9adcda3fc9deb", features = [ "asm" ] }

[dev-dependencies]
process_control = "3.0"
Expand Down
8 changes: 4 additions & 4 deletions internal/shim-sev/Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion internal/shim-sgx/.cargo/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
target = "x86_64-unknown-linux-musl"
rustflags = [
"-C", "relocation-model=pic",
"-C", "link-args=-Wl,--sort-section=alignment -nostartfiles",
"-C", "link-args=-Wl,--sort-section=alignment,-Tlayout.ld -nostartfiles",
"-C", "link-self-contained=no",
]
Loading