Verifier: change fn name from generate_challenge to generate_suppleme…

…ntal_challenge

Signed-off-by: Qi Feng Huo <[email protected]>

attestation-service/attestation-service/src/bin/grpc/mod.rs

@@ -216,7 +216,7 @@ impl AttestationService for Arc<RwLock<AttestationServer>> {
             .read()
             .await
             .attestation_service
-            .generate_challenge(tee, Some(request.tee_params.clone().into_bytes()))
+            .generate_supplemental_challenge(tee, Some(request.tee_params.clone().into_bytes()))
             .await
             .map_err(|e| Status::aborted(format!("Challenge: {e:?}")))?;
 

attestation-service/attestation-service/src/bin/restful/mod.rs

@@ -189,7 +189,7 @@ pub async fn get_challenge(
     let challenge = cocoas
         .read()
         .await
-        .generate_challenge(tee, Some(request.tee_params.clone().into_bytes()))
+        .generate_supplemental_challenge(tee, Some(request.tee_params.clone().into_bytes()))
         .await
         .context("generate challenge")?;
     Ok(HttpResponse::Ok().body(challenge))

attestation-service/attestation-service/src/lib.rs

@@ -259,13 +259,13 @@ impl AttestationService {
         self.rvps.verify_and_extract(message).await
     }
 
-    pub async fn generate_challenge(
+    pub async fn generate_supplemental_challenge(
         &self,
         tee: Tee,
         tee_parameters: Option<Vec<u8>>,
     ) -> Result<String> {
         let verifier = verifier::to_verifier(&tee)?;
-        verifier.generate_challenge(tee_parameters).await
+        verifier.generate_supplemental_challenge(tee_parameters).await
     }
 }
 

attestation-service/verifier/src/lib.rs

@@ -167,7 +167,7 @@ pub trait Verifier {
         expected_init_data_hash: &InitDataHash,
     ) -> Result<TeeEvidenceParsedClaim>;
 
-    async fn generate_challenge(
+    async fn generate_supplemental_challenge(
         &self,
         _tee_parameters: Option<Vec<u8>>,
     ) -> Result<String> {

attestation-service/verifier/src/se/mod.rs

@@ -27,7 +27,7 @@ impl Verifier for SeVerifier {
         verify_evidence(evidence, expected_report_data, expected_init_data_hash).await
     }
 
-    async fn generate_challenge(
+    async fn generate_supplemental_challenge(
         &self,
         _tee_parameters: Option<Vec<u8>>,
     ) -> Result<String> {

kbs/src/api/src/attestation/coco/builtin.rs

@@ -46,15 +46,15 @@ impl Attest for BuiltInCoCoAs {
             .await
     }
 
-    async fn generate_challenge(
+    async fn generate_supplemental_challenge(
         &self,
         tee: Tee,
         tee_parameters: Option<Vec<u8>>,
     ) -> Result<String> {
         self.inner
             .read()
             .await
-            .generate_challenge(tee, tee_parameters)
+            .generate_supplemental_challenge(tee, tee_parameters)
             .await
     }
 }

kbs/src/api/src/attestation/coco/grpc.rs

@@ -127,7 +127,7 @@ impl Attest for GrpcClientPool {
         Ok(token)
     }
 
-    async fn generate_challenge(
+    async fn generate_supplemental_challenge(
         &self,
         tee: Tee,
         tee_parameters: Option<Vec<u8>>,

kbs/src/api/src/attestation/intel_trust_authority/mod.rs

@@ -123,7 +123,7 @@ impl Attest for IntelTrustAuthority {
         Ok(resp_data.token.clone())
     }
 
-    async fn generate_challenge(
+    async fn generate_supplemental_challenge(
         &self,
         _tee: Tee,
         _tee_parameters: Option<Vec<u8>>,

kbs/src/api/src/attestation/mod.rs

@@ -34,7 +34,7 @@ pub trait Attest: Send + Sync {
     async fn verify(&self, tee: Tee, nonce: &str, attestation: &str) -> Result<String>;
 
     /// generate the challenge payload to pass to attester based on Tee and nonce
-    async fn generate_challenge(&self, tee: Tee, tee_parameters: Option<Vec<u8>>)
+    async fn generate_supplemental_challenge(&self, tee: Tee, tee_parameters: Option<Vec<u8>>)
         -> Result<String>;
 }
 
@@ -94,23 +94,23 @@ impl AttestationService {
         }
     }
 
-    pub async fn generate_challenge(
+    pub async fn generate_supplemental_challenge(
         &self,
         tee: Tee,
         tee_parameters: Option<Vec<u8>>,
     ) -> Result<String> {
         match self {
             #[cfg(feature = "coco-as-grpc")]
             AttestationService::CoCoASgRPC(inner) => {
-                inner.generate_challenge(tee, tee_parameters).await
+                inner.generate_supplemental_challenge(tee, tee_parameters).await
             }
             #[cfg(any(feature = "coco-as-builtin", feature = "coco-as-builtin-no-verifier"))]
             AttestationService::CoCoASBuiltIn(inner) => {
-                inner.generate_challenge(tee, tee_parameters).await
+                inner.generate_supplemental_challenge(tee, tee_parameters).await
             }
             #[cfg(feature = "intel-trust-authority-as")]
             AttestationService::IntelTA(inner) => {
-                inner.generate_challenge(tee, tee_parameters).await
+                inner.generate_supplemental_challenge(tee, tee_parameters).await
             }
         }
     }

kbs/src/api/src/http/attest.rs

@@ -24,7 +24,7 @@ pub(crate) async fn auth(
     debug!("Auth Request: {:?}", &request);
 
     let extra_params = attestation_service
-        .generate_challenge(request.tee, Some(request.extra_params.clone().into_bytes()))
+        .generate_supplemental_challenge(request.tee, Some(request.extra_params.clone().into_bytes()))
         .await
         .unwrap();