enclave_build: fix argument parsing

Fixed inconsistencies in argument names that make it impossible to generate a signed image. Fixed potential image corruption if the output image already exists by truncating it before writing to it. Bump version to 0.2.0. Signed-off-by: sstone <[email protected]>
aws · Jan 17, 2023 · 4165a15 · 4165a15
1 parent c77a57a
commit 4165a15
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/enclave_build/Cargo.toml b/enclave_build/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "enclave_build"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["The AWS Nitro Enclaves Team <[email protected]>"]
 edition = "2018"
 rust-version = "1.58"

diff --git a/enclave_build/src/main.rs b/enclave_build/src/main.rs
@@ -131,11 +131,9 @@ fn main() {
     let linuxkit_path = matches.value_of("linuxkit_path").unwrap();
     let output = matches.value_of("output").unwrap();
     let signing_certificate = matches
-        .value_of("signing_certificate")
-        .map(|val| val.to_string());
-    let private_key = matches
-        .value_of("private_certificate")
+        .value_of("signing-certificate")
         .map(|val| val.to_string());
+    let private_key = matches.value_of("private-key").map(|val| val.to_string());
     let img_name = matches.value_of("image_name").map(|val| val.to_string());
     let img_version = matches.value_of("image_version").map(|val| val.to_string());
     let metadata = matches.value_of("metadata").map(|val| val.to_string());
@@ -144,6 +142,7 @@ fn main() {
         .read(true)
         .write(true)
         .create(true)
+        .truncate(true)
         .open(output)
         .expect("Failed to create output file");