review changes

api-model/src/converter.rs

@@ -309,4 +309,4 @@ impl Default for DsmConfiguration {
             dsm_url: "https://apps.amer.smartkey.io/".to_string(),
         }
     }
-}
+}

api-model/src/enclave.rs

@@ -155,4 +155,4 @@ impl Default for CcmBackendUrl {
             port: 443,
         }
     }
-}
+}

tools/container-converter/src/image_builder/enclave.rs

@@ -109,7 +109,7 @@ impl EnclaveSettings {
             is_debug: converter_options.debug.unwrap_or(false),
             enable_overlay_filesystem_persistence: converter_options.enable_overlay_filesystem_persistence.unwrap_or(false),
             ccm_backend_url: CcmBackendUrl::new(converter_options.ccm_configuration.clone().unwrap_or_default().ccm_url.as_str()).unwrap_or_default(),
-            dsm_configuration: converter_options.dsm_configuration.clone().unwrap_or_default()
+            dsm_configuration: converter_options.dsm_configuration.clone().unwrap_or_default(),
         }
     }
 }

vsock-proxy/enclave/src/dsm_key_config.rs

@@ -37,10 +37,10 @@ struct ClientWithKey {
 }
 
 /// Information needed to connect to DSM as a client
-pub struct ClientConnectionInfo<'a> {
-    pub fs_api_key: Option<String>,
-    pub auth_cert: Option<&'a mut CertificateResult>,
-    pub dsm_url: String,
+pub(crate) struct ClientConnectionInfo<'a> {
+    pub(crate) fs_api_key: Option<String>,
+    pub(crate) auth_cert: Option<&'a mut CertificateResult>,
+    pub(crate) dsm_url: String,
 }
 
 fn dsm_create_client(conn_info: ClientConnectionInfo) -> Result<SdkmsClient, String> {

vsock-proxy/enclave/src/file_system.rs

@@ -257,7 +257,7 @@ async fn get_key_file(
                 let dsm_url = conn_info.dsm_url.clone();
                 info!("Accessing DSM to store passkey in luks2 token");
                 let enc_resp = dsm_enc_with_overlayfs_key(conn_info, passkey)?;
-                create_luks2_token_input(TOKEN_IN_FILE, dsm_url, enc_resp)?;
+                create_luks2_token_input(TOKEN_IN_FILE, &dsm_url, enc_resp)?;
 
                 info!("Adding token object to the RW device");
                 update_luks_token(device_path, TOKEN_IN_FILE, TokenOp::Import).await?;
@@ -270,7 +270,7 @@ async fn get_key_file(
 /// Generate the luks2 token object and write the same to
 /// the json file which will be used to add a luks2 header
 /// to the RW blockfile
-fn create_luks2_token_input(token_path: &str, dsm_url: String, enc_resp: EncryptResponse) -> Result<(), String> {
+fn create_luks2_token_input(token_path: &str, dsm_url: &String, enc_resp: EncryptResponse) -> Result<(), String> {
     info!("Creating Luks2 token object");
     let iv = enc_resp
         .iv
@@ -283,7 +283,7 @@ fn create_luks2_token_input(token_path: &str, dsm_url: String, enc_resp: Encrypt
     let token_object = LuksToken {
         token_type: "Fortanix-sealing-key".to_string(),
         key_slots: vec!["0".to_string()],
-        endpoint: dsm_url,
+        endpoint: dsm_url.into(),
         isvsvn: None,
         tag,
         enc_key: enc_resp.cipher,
@@ -526,4 +526,4 @@ async fn generate_volume_passkey() -> Result<Blob, String> {
 
     // Return key material as a blob
     Ok(Blob::from(key_blob))
-}
+}