attestation: rename wire format helpers

Author: kvinwang

dstack-attest/src/attestation.rs

@@ -466,11 +466,11 @@ pub enum VersionedAttestation {
 
 impl Encode for VersionedAttestation {
     fn size_hint(&self) -> usize {
-        self.to_scale().len()
+        self.to_bytes().len()
     }
 
     fn encode_to<T: Output + ?Sized>(&self, dest: &mut T) {
-        dest.write(&self.to_scale());
+        dest.write(&self.to_bytes());
     }
 }
 
@@ -483,7 +483,7 @@ impl Decode for VersionedAttestation {
         };
         let mut bytes = vec![0u8; remaining_len];
         input.read(&mut bytes)?;
-        Self::from_scale(&bytes).map_err(|err| {
+        Self::from_bytes(&bytes).map_err(|err| {
             ScaleError::from(std::io::Error::new(
                 std::io::ErrorKind::InvalidData,
                 err.to_string(),
@@ -494,30 +494,30 @@ impl Decode for VersionedAttestation {
 
 impl VersionedAttestation {
     /// Decode versioned attestation bytes.
-    pub fn from_scale(scale: &[u8]) -> Result<Self> {
-        let Some(first) = scale.first().copied() else {
+    pub fn from_bytes(bytes: &[u8]) -> Result<Self> {
+        let Some(first) = bytes.first().copied() else {
             bail!("Empty attestation bytes");
         };
         if first == 0x00 {
-            let legacy = LegacyVersionedAttestation::decode(&mut &scale[..])
+            let legacy = LegacyVersionedAttestation::decode(&mut &bytes[..])
                 .context("Failed to decode legacy VersionedAttestation")?;
             return match legacy {
                 LegacyVersionedAttestation::V0 { attestation } => Ok(Self::V0 { attestation }),
             };
         }
         if is_cbor_map_prefix(first) {
-            let attestation = AttestationV1::from_cbor(scale)?;
+            let attestation = AttestationV1::from_cbor(bytes)?;
             return Ok(Self::V1 { attestation });
         }
-        if first == 0x01 && scale.get(1).is_some_and(|byte| is_cbor_map_prefix(*byte)) {
-            let attestation = AttestationV1::from_cbor(&scale[1..])?;
+        if first == 0x01 && bytes.get(1).is_some_and(|byte| is_cbor_map_prefix(*byte)) {
+            let attestation = AttestationV1::from_cbor(&bytes[1..])?;
             return Ok(Self::V1 { attestation });
         }
         bail!("Unknown attestation wire format");
     }
 
     /// Encode versioned attestation bytes.
-    pub fn to_scale(&self) -> Vec<u8> {
+    pub fn to_bytes(&self) -> Vec<u8> {
         match self {
             Self::V0 { attestation } => LegacyVersionedAttestation::V0 {
                 attestation: attestation.clone(),
@@ -529,6 +529,16 @@ impl VersionedAttestation {
         }
     }
 
+    #[doc(hidden)]
+    pub fn from_scale(bytes: &[u8]) -> Result<Self> {
+        Self::from_bytes(bytes)
+    }
+
+    #[doc(hidden)]
+    pub fn to_scale(&self) -> Vec<u8> {
+        self.to_bytes()
+    }
+
     /// Try to project any version into the legacy attestation structure.
     pub fn try_into_inner(self) -> Result<Attestation> {
         match self {
@@ -1206,9 +1216,9 @@ mod tests {
         let payload = r#"{"pod_uid":"abc","workload_id":"default/app"}"#.to_string();
         let encoded = dummy_tdx_attestation(report_data)
             .into_versioned_with_report_data_payload(payload.clone())
-            .to_scale();
+            .to_bytes();
         assert!(matches!(encoded.first(), Some(0xa0..=0xbf)));
-        let decoded = VersionedAttestation::from_scale(&encoded).expect("decode attestation");
+        let decoded = VersionedAttestation::from_bytes(&encoded).expect("decode attestation");
         assert_eq!(decoded.report_data_payload(), Some(payload.as_str()));
         assert_eq!(decoded.clone().into_inner().report_data, report_data);
         let VersionedAttestation::V1 { attestation } = decoded else {

guest-agent-simulator/src/main.rs

@@ -172,7 +172,7 @@ mod tests {
         let platform = load_fixture_platform();
         let report_data = [0x5a; 64];
         let response = platform.attest_response(report_data).unwrap();
-        let patched = VersionedAttestation::from_scale(&response.attestation).unwrap();
+        let patched = VersionedAttestation::from_bytes(&response.attestation).unwrap();
         let attestation = patched.into_inner();
         assert_eq!(attestation.report_data, report_data);
     }
@@ -188,7 +188,7 @@ mod tests {
         let platform = SimulatorPlatform::new(fixture, false);
         let report_data = [0x5a; 64];
         let response = platform.attest_response(report_data).unwrap();
-        let patched = VersionedAttestation::from_scale(&response.attestation).unwrap();
+        let patched = VersionedAttestation::from_bytes(&response.attestation).unwrap();
         let attestation = patched.into_inner();
         assert_eq!(attestation.report_data, original);
         assert_ne!(attestation.report_data, report_data);

guest-agent-simulator/src/simulator.rs

@@ -19,7 +19,7 @@ pub fn load_versioned_attestation(path: impl AsRef<Path>) -> Result<VersionedAtt
             path.display()
         )
     })?;
-    VersionedAttestation::from_scale(&attestation_bytes)
+    VersionedAttestation::from_bytes(&attestation_bytes)
         .context("Failed to decode simulator attestation")
 }
 
@@ -51,7 +51,7 @@ pub fn simulated_attest_response(
 ) -> AttestResponse {
     AttestResponse {
         attestation: maybe_patch_report_data(attestation, report_data, patch_report_data, "attest")
-            .to_scale(),
+            .to_bytes(),
     }
 }
 

guest-agent/src/backend.rs

@@ -46,7 +46,7 @@ impl PlatformBackend for RealPlatform {
     fn attest_response(&self, report_data: [u8; 64]) -> Result<AttestResponse> {
         let attestation = Attestation::quote(&report_data).context("Failed to get attestation")?;
         Ok(AttestResponse {
-            attestation: attestation.into_versioned().to_scale(),
+            attestation: attestation.into_versioned().to_bytes(),
         })
     }
 

guest-agent/src/rpc_service.rs

@@ -849,7 +849,7 @@ pNs85uhOZE8z2jr8Pg==
 
             fn attest_response(&self, report_data: [u8; 64]) -> Result<AttestResponse> {
                 Ok(AttestResponse {
-                    attestation: patch_report_data(&self.attestation, report_data).to_scale(),
+                    attestation: patch_report_data(&self.attestation, report_data).to_bytes(),
                 })
             }
 
@@ -865,7 +865,7 @@ pNs85uhOZE8z2jr8Pg==
             cert_client: dummy_cert_client,
             demo_cert: RwLock::new(String::new()),
             platform: Arc::new(TestSimulatorPlatform {
-                attestation: VersionedAttestation::from_scale(
+                attestation: VersionedAttestation::from_bytes(
                     &std::fs::read(temp_attestation_file.path()).unwrap(),
                 )
                 .unwrap(),

kms/src/main_service/upgrade_authority.rs

@@ -76,7 +76,7 @@ pub(crate) async fn local_kms_boot_info(pccs_url: Option<&str>) -> Result<BootIn
     let response = app_attest(pad64([0u8; 32]))
         .await
         .context("Failed to get local KMS attestation")?;
-    let attestation = VersionedAttestation::from_scale(&response.attestation)
+    let attestation = VersionedAttestation::from_bytes(&response.attestation)
         .context("Failed to decode local KMS attestation")?
         .into_inner();
     let verified = attestation

kms/src/onboard_service.rs

@@ -111,7 +111,7 @@ impl OnboardRpc for OnboardHandler {
             .context("Failed to get attestation")?;
 
         // Decode and verify the attestation to get real device ID
-        let attestation = VersionedAttestation::from_scale(&response.attestation)
+        let attestation = VersionedAttestation::from_bytes(&response.attestation)
             .context("Failed to decode attestation")?
             .into_inner();
         let attestation_mode = serde_json::to_value(attestation.quote.mode())
@@ -195,7 +195,7 @@ impl Keys {
         let response = app_attest(report_data.to_vec())
             .await
             .context("Failed to get quote")?;
-        let attestation = VersionedAttestation::from_scale(&response.attestation)
+        let attestation = VersionedAttestation::from_bytes(&response.attestation)
             .context("Invalid attestation")?;
 
         // Sign WWW server cert with KMS cert
@@ -376,7 +376,7 @@ async fn gen_ra_cert(ca_cert_pem: String, ca_key_pem: String) -> Result<(String,
         .await
         .context("Failed to get quote")?;
     let attestation =
-        VersionedAttestation::from_scale(&response.attestation).context("Invalid attestation")?;
+        VersionedAttestation::from_bytes(&response.attestation).context("Invalid attestation")?;
     let req = CertRequest::builder()
         .subject("RA-TLS TEMP Cert")
         .attestation(&attestation)

ra-tls/src/attestation.rs

@@ -27,7 +27,7 @@ pub fn from_ext_getter(
 ) -> Result<Option<Attestation>> {
     // Try to detect attestation mode from certificate extension
     if let Some(attestation_bytes) = get_ext(oids::PHALA_RATLS_ATTESTATION)? {
-        let attestation = VersionedAttestation::from_scale(&attestation_bytes)
+        let attestation = VersionedAttestation::from_bytes(&attestation_bytes)
             .context("Failed to decode attestation from cert extension")?
             .into_inner();
         return Ok(Some(attestation));

ra-tls/src/cert.rs

@@ -388,7 +388,7 @@ impl<Key> CertRequest<'_, Key> {
             add_ext(&mut params, PHALA_RATLS_CERT_USAGE, usage);
         }
         if let Some(ver_att) = self.attestation {
-            let attestation_bytes = ver_att.clone().into_stripped().to_scale();
+            let attestation_bytes = ver_att.clone().into_stripped().to_bytes();
             add_ext(&mut params, PHALA_RATLS_ATTESTATION, &attestation_bytes);
         }
         if let Some(ca_level) = self.ca_level {

verifier/src/verification.rs

@@ -389,7 +389,7 @@ impl CvmVerifier {
 
     pub async fn verify(&self, request: VerificationRequest) -> Result<VerificationResponse> {
         let attestation = if let Some(attestation) = &request.attestation {
-            VersionedAttestation::from_scale(attestation).context("Failed to decode attestaion")?
+            VersionedAttestation::from_bytes(attestation).context("Failed to decode attestaion")?
         } else if let Some(tdx_quote) = request.quote {
             let event_log = request
                 .event_log