rust/pvimg: Refactor keys arguments into own struct

This makes it easier to add new user keys related CLI options.

Acked-by: Hendrik Brueckner <brueckner@linux.ibm.com>
Reviewed-by: Steffen Eiden <seiden@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>

rust/pvimg/src/cmd/common.rs

@@ -2,13 +2,13 @@
 //
 // Copyright IBM Corp. 2024
 
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 
 use anyhow::Result;
 use log::info;
 use pv::{misc::read_file, request::Confidential};
 
-use crate::cli::CreateBootImageExperimentalArgs;
+use crate::cli::{CreateBootImageExperimentalArgs, UserKeys};
 
 #[macro_export]
 /// Makes it easier to
@@ -24,8 +24,7 @@ pub struct UserProvidedKeys {
 
 /// Reads all user provided keys.
 pub fn read_user_provided_keys(
-    cck_path: Option<&Path>,
-    hdr_key_path: Option<&Path>,
+    keys: &UserKeys,
     experimental_args: &CreateBootImageExperimentalArgs,
 ) -> Result<UserProvidedKeys> {
     let components_key = {
@@ -44,7 +43,7 @@ pub fn read_user_provided_keys(
         }
     };
     let aead_key = {
-        match hdr_key_path {
+        match &keys.hdr_key {
             Some(key_path) => {
                 info!(
                     "Use file '{}' as the Secure Execution header protection",
@@ -63,7 +62,7 @@ pub fn read_user_provided_keys(
     };
 
     let cck = {
-        match cck_path {
+        match &keys.cck {
             Some(key_path) => {
                 info!(
                     "Use file '{}' as the customer communication key (CCK)",

rust/pvimg/src/cmd/create.rs

@@ -126,11 +126,7 @@ pub fn create(opt: &CreateBootImageArgs) -> Result<OwnExitCode> {
     let verified_host_keys = opt
         .certificate_args
         .get_verified_hkds("Secure Execution image")?;
-    let user_provided_keys = read_user_provided_keys(
-        opt.cck.as_deref(),
-        opt.hdr_key.as_deref(),
-        &opt.experimental_args,
-    )?;
+    let user_provided_keys = read_user_provided_keys(&opt.keys, &opt.experimental_args)?;
     let (plaintext_flags, secret_flags) = parse_flags(opt)?;
 
     if plaintext_flags.is_set(PcfV1::NoComponentEncryption) {