Merge pull request #191 from Dstack-TEE/rm-mr-kp

Remove the unused mr_key_provider

Author: kvinwang

guest-agent/rpc/proto/agent_rpc.proto

@@ -189,8 +189,6 @@ message AppInfo {
   bytes mr_aggregated = 9;
   // OS Image hash
   bytes os_image_hash = 10;
-  // MR Key Provider
-  bytes mr_key_provider = 11;
   // Key provider info
   string key_provider_info = 12;
   // Compose hash

guest-agent/src/http_routes.rs

@@ -39,7 +39,6 @@ async fn index(state: &State<AppState>) -> Result<RawHtml<String>, String> {
         device_id,
         mr_aggregated: _,
         os_image_hash: _,
-        mr_key_provider: _,
         key_provider_info,
         compose_hash: _,
         tcb_info,

guest-agent/src/rpc_service.rs

@@ -120,7 +120,6 @@ pub async fn get_info(state: &AppState, external: bool) -> Result<AppInfo> {
             "rtmr3": hex::encode(app_info.rtmr3),
             "mr_aggregated": hex::encode(app_info.mr_aggregated),
             "os_image_hash": hex::encode(&app_info.os_image_hash),
-            "mr_key_provider": hex::encode(app_info.mr_key_provider),
             "compose_hash": hex::encode(&app_info.compose_hash),
             "device_id": hex::encode(&app_info.device_id),
             "event_log": event_log,
@@ -140,7 +139,6 @@ pub async fn get_info(state: &AppState, external: bool) -> Result<AppInfo> {
         device_id: app_info.device_id,
         mr_aggregated: app_info.mr_aggregated.to_vec(),
         os_image_hash: app_info.os_image_hash.clone(),
-        mr_key_provider: app_info.mr_key_provider.to_vec(),
         key_provider_info: String::from_utf8(app_info.key_provider_info).unwrap_or_default(),
         compose_hash: app_info.compose_hash.clone(),
         app_cert: state.inner.demo_cert.clone(),

kms/src/main_service.rs

@@ -428,7 +428,6 @@ impl RpcHandler {
             mr_aggregated: app_info.mr_aggregated.to_vec(),
             os_image_hash: os_image_hash.clone(),
             mr_system: app_info.mr_system.to_vec(),
-            mr_key_provider: app_info.mr_key_provider.to_vec(),
             app_id: app_info.app_id,
             compose_hash: app_info.compose_hash,
             instance_id: app_info.instance_id,

kms/src/main_service/upgrade_authority.rs

@@ -23,8 +23,6 @@ pub(crate) struct BootInfo {
     #[serde(with = "hex_bytes")]
     pub mr_system: Vec<u8>,
     #[serde(with = "hex_bytes")]
-    pub mr_key_provider: Vec<u8>,
-    #[serde(with = "hex_bytes")]
     pub app_id: Vec<u8>,
     #[serde(with = "hex_bytes")]
     pub compose_hash: Vec<u8>,

ra-tls/src/attestation.rs

@@ -207,7 +207,6 @@ impl<T> Attestation<T> {
             os_image_hash: self.find_event_payload("os-image-hash").unwrap_or_default(),
             mr_system,
             mr_aggregated,
-            mr_key_provider,
             key_provider_info,
         })
     }
@@ -414,9 +413,6 @@ pub struct AppInfo {
     /// Measurement of the app image
     #[serde(with = "hex_bytes")]
     pub os_image_hash: Vec<u8>,
-    /// Measurement of the key provider
-    #[serde(with = "hex_bytes")]
-    pub mr_key_provider: [u8; 32],
     /// Key provider info
     #[serde(with = "hex_bytes")]
     pub key_provider_info: Vec<u8>,

sdk/curl/api-tappd.md

@@ -194,7 +194,6 @@ curl --unix-socket /var/run/tappd.sock http://localhost/prpc/Tappd.Info
   "device_id": "<hex-encoded-device-id>",
   "mr_aggregated": "<hex-encoded-mr-aggregated>",
   "os_image_hash": "<hex-encoded-os-image-hash>",
-  "mr_key_provider": "<hex-encoded-mr-key-provider>",
   "key_provider_info": "<key-provider-info-string>",
   "compose_hash": "<hex-encoded-compose-hash>"
 }

sdk/curl/api.md

@@ -159,7 +159,6 @@ curl --unix-socket /var/run/dstack.sock http://dstack/Info
   "device_id": "<hex-encoded-device-id>",
   "mr_aggregated": "<hex-encoded-mr-aggregated>",
   "os_image_hash": "<hex-encoded-os-image-hash>",
-  "mr_key_provider": "<hex-encoded-mr-key-provider>",
   "key_provider_info": "<key-provider-info-string>",
   "compose_hash": "<hex-encoded-compose-hash>"
 }

sdk/go/dstack/client.go

@@ -68,7 +68,6 @@ type InfoResponse struct {
 	PublicSysinfo   bool   `json:"public_sysinfo"`
 	DeviceID        string `json:"device_id"`
 	MrAggregated    string `json:"mr_aggregated"`
-	MrKeyProvider   string `json:"mr_key_provider"`
 	KeyProviderInfo string `json:"key_provider_info"`
 	OsImageHash     string `json:"os_image_hash"`
 	ComposeHash     string `json:"compose_hash"`

sdk/js/src/index.ts

@@ -47,7 +47,6 @@ export interface InfoResponse {
   device_id: string
   mr_aggregated: string
   os_image_hash: string
-  mr_key_provider: string
   key_provider_info: string
   compose_hash: string
 }