rename init_quote with get_qe_target_info

Signed-off-by: Jun Kimura <jun.kimura@datachain.jp>

Author: bluele

app/src/commands/enclave.rs

@@ -91,7 +91,7 @@ fn run_generate_key<E: EnclaveCommandAPI<S>, S: CommitStore>(
     enclave: E,
     input: &GenerateKey,
 ) -> Result<()> {
-    let (target_info, _) = remote_attestation::init_quote(input.target_qe)?;
+    let (target_info, _) = remote_attestation::get_target_qe_info(input.target_qe)?;
     let res = enclave
         .generate_enclave_key(
             GenerateEnclaveKeyInput {

modules/remote-attestation/src/common.rs

@@ -5,7 +5,15 @@ use sgx_types::{
     sgx_target_info_t,
 };
 
-pub fn init_quote(
+/// Get target QE info
+///
+/// # Arguments
+/// - `target_qe_type` - QE type(QE, QE3, QE3SIM)
+///
+/// # Returns
+/// - `sgx_target_info_t` - Target info
+/// - `sgx_epid_group_id_t` - If `target_qe_type` is QE, return epid group id. Otherwise, return default value
+pub fn get_target_qe_info(
     target_qe_type: QEType,
 ) -> Result<(sgx_target_info_t, sgx_epid_group_id_t), Error> {
     let mut target_info = sgx_target_info_t::default();

modules/remote-attestation/src/ias.rs

@@ -1,4 +1,4 @@
-use crate::common::init_quote;
+use crate::common::get_target_qe_info;
 use crate::errors::Error;
 use crate::ias_utils::{
     decode_spid, get_quote, get_report_from_intel, get_sigrl_from_intel, validate_qe_report,
@@ -27,7 +27,7 @@ pub fn run_ias_ra(
     }
 
     let spid = decode_spid(&spid)?;
-    let (target_info, epid_group_id) = init_quote(QEType::QE)?;
+    let (target_info, epid_group_id) = get_target_qe_info(QEType::QE)?;
     // Now sigrl is the revocation list, a vec<u8>
     let sigrl = get_sigrl_from_intel(mode, epid_group_id, &ias_key)?;
     let (quote, qe_report) = get_quote(sigrl, ek_info.report, SGX_QUOTE_SIGN_TYPE, spid)?;

modules/remote-attestation/src/ias_simulation.rs

@@ -1,6 +1,6 @@
 use crate::errors::Error;
+use crate::get_target_qe_info;
 use crate::ias_utils::{get_quote, validate_qe_report, SGX_QUOTE_SIGN_TYPE};
-use crate::init_quote;
 use attestation_report::{IASAttestationVerificationReport, IASSignedReport, QEType};
 use base64::{engine::general_purpose::STANDARD as Base64Std, Engine};
 use crypto::Address;
@@ -17,7 +17,7 @@ pub fn run_ias_ra_simulation(
     signing_key: rsa::pkcs1v15::SigningKey<sha2::Sha256>,
     signing_cert: Vec<u8>,
 ) -> Result<IASSignedReport, Error> {
-    let (target_info, _) = init_quote(QEType::QE)?;
+    let (target_info, _) = get_target_qe_info(QEType::QE)?;
     let ek_info = key_manager.load(target_enclave_key).map_err(|e| {
         Error::key_manager(
             format!("cannot load enclave key: {}", target_enclave_key),

modules/remote-attestation/src/lib.rs

@@ -10,7 +10,7 @@ pub mod ias_simulation;
 mod ias_utils;
 pub mod zkdcap;
 
-pub use common::init_quote;
+pub use common::get_target_qe_info;
 pub use dcap_pcs;
 pub use ias_utils::{validate_qe_report, IASMode, IAS_HOSTNAME};
 #[cfg(feature = "sgx-sw")]

tests/integration/src/lib.rs

@@ -80,7 +80,7 @@ mod tests {
             info!("this test is running in HW mode");
         }
 
-        let (qe_target_info, _) = remote_attestation::init_quote(QEType::QE)?;
+        let (qe_target_info, _) = remote_attestation::get_target_qe_info(QEType::QE)?;
         let operator = Address::from_hex_string("0x396e1ccc2f11cd6d2114c2449dad7751357e413e")?;
         let op_ek_addr = match enclave.generate_enclave_key(
             GenerateEnclaveKeyInput {
@@ -192,7 +192,7 @@ mod tests {
             use remote_attestation::zkvm::prover::Risc0ProverMode;
             use zkdcap_risc0::DCAP_QUOTE_VERIFIER_ELF;
 
-            let target_info = remote_attestation::init_quote(QEType::QE3SIM)?.0;
+            let target_info = remote_attestation::get_target_qe_info(QEType::QE3SIM)?.0;
             let zkdcap_ek_addr = match enclave.generate_enclave_key(
                 GenerateEnclaveKeyInput {
                     operator: Some(operator),
@@ -230,7 +230,7 @@ mod tests {
             use remote_attestation::zkvm::prover::Risc0ProverMode;
             use zkdcap_risc0::DCAP_QUOTE_VERIFIER_ELF;
 
-            let target_info = remote_attestation::init_quote(QEType::QE3)?.0;
+            let target_info = remote_attestation::get_target_qe_info(QEType::QE3)?.0;
             let zkdcap_ek_addr = match enclave.generate_enclave_key(
                 GenerateEnclaveKeyInput {
                     operator: Some(operator),
@@ -296,7 +296,7 @@ mod tests {
         enclave: &Enclave<store::memory::MemStore>,
     ) -> Result<(), anyhow::Error> {
         let operator = Address::from_hex_string("0x396e1ccc2f11cd6d2114c2449dad7751357e413e")?;
-        let (target_info, _) = remote_attestation::init_quote(QEType::QE)?;
+        let (target_info, _) = remote_attestation::get_target_qe_info(QEType::QE)?;
         let signer = match enclave.generate_enclave_key(
             GenerateEnclaveKeyInput {
                 operator: Some(operator),