lib: Rename keylime_error.rs as error.rs

Add specific error type ContextInfoError for the context_info
module and remove the usage of expect() to avoid panic.

Signed-off-by: Anderson Toshiyuki Sasaki <[email protected]>

Author: ansasaki

keylime-agent/src/common.rs

@@ -1,15 +1,12 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2021 Keylime Authors
 
-use keylime::keylime_error::{Error, Result};
-
 use crate::permissions;
 
-use keylime::algorithms::{
-    EncryptionAlgorithm, HashAlgorithm, SignAlgorithm,
-};
 use keylime::{
+    algorithms::{EncryptionAlgorithm, HashAlgorithm, SignAlgorithm},
     crypto::{hash, tss_pubkey_to_pem},
+    error::{Error, Result},
     hash_ek, tpm,
 };
 use log::*;

keylime-agent/src/main.rs

@@ -56,9 +56,9 @@ use keylime::{
     config,
     crypto::{self, x509::CertificateBuilder},
     device_id::{DeviceID, DeviceIDBuilder},
+    error::{Error, Result},
     hash_ek,
     ima::MeasurementList,
-    keylime_error::{Error, Result},
     list_parser::parse_list,
     permissions,
     registrar_client::RegistrarClientBuilder,

keylime-agent/src/revocation.rs

@@ -6,8 +6,7 @@ use actix_web::rt;
 use crate::config::{AgentConfig, KeylimeConfig};
 use crate::crypto;
 use crate::secure_mount;
-use keylime::keylime_error::*;
-use keylime::list_parser::parse_list;
+use keylime::{error::*, list_parser::parse_list};
 use log::*;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;

keylime-agent/src/secure_mount.rs

@@ -3,7 +3,7 @@
 
 use super::*;
 
-use keylime::keylime_error::{Error, Result};
+use keylime::error::{Error, Result};
 use std::fs;
 use std::io::BufRead;
 use std::os::unix::fs::PermissionsExt;

keylime-push-model-agent/src/main.rs

@@ -214,7 +214,7 @@ fn get_context(args: &Args) -> Result<Option<context_info::ContextInfo>> {
             tpm_hash_alg: config.get_tpm_hash_alg(),
             tpm_signing_alg: config.get_tpm_signing_alg(),
         },
-    );
+    )?;
     Ok(Some(context_info))
 }
 

keylime-push-model-agent/src/registration.rs

@@ -1,9 +1,10 @@
-use keylime::agent_registration::{
-    AgentRegistration, AgentRegistrationConfig,
+use keylime::{
+    agent_registration::{AgentRegistration, AgentRegistrationConfig},
+    cert,
+    config::PushModelConfigTrait,
+    context_info,
+    error::Result,
 };
-use keylime::config::PushModelConfigTrait;
-use keylime::keylime_error::Result;
-use keylime::{cert, context_info};
 
 pub async fn check_registration(
     context_info: Option<context_info::ContextInfo>,
@@ -86,7 +87,8 @@ mod tests {
             tpm_hash_alg: "sha256".to_string(),
             tpm_signing_alg: "rsassa".to_string(),
         };
-        let mut context_info = ContextInfo::new_from_str(alg_config);
+        let mut context_info = ContextInfo::new_from_str(alg_config)
+            .expect("Failed to create context info from string");
         let result = register_agent(&config, &mut context_info).await;
         assert!(result.is_err());
         assert!(context_info.flush_context().is_ok());

keylime-push-model-agent/src/struct_filler.rs

@@ -648,7 +648,8 @@ mod tests {
                 tpm_hash_alg: config.get_tpm_hash_alg(),
                 tpm_signing_alg: config.get_tpm_signing_alg(),
             },
-        );
+        )
+        .expect("Failed to create context info from string");
         let mut filler = FillerFromHardware::new(&mut context_info);
         let attestation_request = filler.get_attestation_request_final();
         assert_eq!(attestation_request.data.type_, "attestation");
@@ -669,7 +670,8 @@ mod tests {
                 tpm_hash_alg: config.get_tpm_hash_alg(),
                 tpm_signing_alg: config.get_tpm_signing_alg(),
             },
-        );
+        )
+        .expect("Failed to create context info from string");
         let mut filler = FillerFromHardware::new(&mut context_info);
         let session_request = filler.get_session_request();
         assert_eq!(session_request.data.data_type, "session");
@@ -690,7 +692,8 @@ mod tests {
                 tpm_hash_alg: config.get_tpm_hash_alg(),
                 tpm_signing_alg: config.get_tpm_signing_alg(),
             },
-        );
+        )
+        .expect("Failed to create context info from string");
         let mut filler = FillerFromHardware::new(&mut context_info);
         let evidence_handling_request =
             filler.get_evidence_handling_request();

keylime/src/agent_data.rs

@@ -1,5 +1,5 @@
 use crate::algorithms::{HashAlgorithm, SignAlgorithm};
-use crate::keylime_error::Result;
+use crate::error::Result;
 use crate::tpm;
 use serde::{Deserialize, Serialize};
 use std::fs::File;

keylime/src/agent_registration.rs

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2025 Keylime Authors
-use crate::keylime_error::{Error, Result};
 use crate::{
     agent_identity::AgentIdentityBuilder,
     crypto::{self},
     device_id,
+    error::{Error, Result},
     registrar_client::RegistrarClientBuilder,
     tpm::{self},
 };

keylime/src/cert.rs

@@ -1,5 +1,4 @@
-use crate::crypto;
-use crate::keylime_error::Result;
+use crate::{crypto, error::Result};
 use log::debug;
 use openssl::pkey::{PKey, Public};
 use openssl::x509::X509;