Uncomment out kernel version

.github/dependabot.yaml

@@ -16,3 +16,7 @@ updates:
     schedule:
       interval: "weekly"
       day: "monday"
+    groups:
+      go-dependency:
+        patterns:
+          - "*"

.github/workflows/checkproto.yaml

@@ -9,7 +9,6 @@ on:
       - "pkg/manager/*.pb.go"
       - "agent/agent.proto"
       - "agent/*.pb.go"
-
   pull_request:
     branches:
       - main
@@ -35,7 +34,7 @@ jobs:
       - name: Set up protoc
         run: |
           PROTOC_VERSION=29.0
-          PROTOC_GEN_VERSION=v1.36.5
+          PROTOC_GEN_VERSION=v1.36.0
           PROTOC_GRPC_VERSION=v1.5.1
 
           # Download and install protoc
@@ -56,7 +55,7 @@ jobs:
       - name: Set up Cocos-AI
         run: |
           # Rename .pb.go files to .pb.go.tmp to prevent conflicts
-          for p in $(ls manager/*.pb.go); do
+          for p in $(ls pkg/manager/*.pb.go); do
             mv $p $p.tmp
           done
 
@@ -68,7 +67,7 @@ jobs:
           make protoc
 
           # Compare generated Go files with the original ones
-          for p in $(ls manager/*.pb.go); do
+          for p in $(ls pkg/manager/*.pb.go); do
             if ! cmp -s $p $p.tmp; then
               echo "Proto file and generated Go file $p are out of sync!"
               exit 1

.github/workflows/hal.yml

@@ -56,7 +56,7 @@ jobs:
         with:
           repository: "buildroot/buildroot"
           path: buildroot
-          ref: 2025.05-rc1
+          ref: 2024.11-rc2
 
       - name: Build hal
         run: |

.github/workflows/main.yaml

@@ -22,11 +22,10 @@ jobs:
           go-version: 1.23.x
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v7
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v2.0.2
+          version: v1.60
 
-        
       - name: Build
         run: |
           make

.golangci.yaml

@@ -1,100 +1,80 @@
-version: "2"
+run:
+  timeout: 3m
+
+issues:
+  max-issues-per-linter: 10
+  max-same-issues: 10
+
+linters-settings:
+  importas:
+    no-unaliased: true
+    no-extra-aliases: false
+    alias:
+      - pkg: github.com/absmach/magistrala/logger
+        alias: mglog
+
+  gocritic:
+    enabled-checks:
+      - dupImport
+      - importShadow
+      - httpNoBody
+      - paramTypeCombine
+      - emptyStringTest
+      - builtinShadow
+      - exposedSyncMutex
+    disabled-checks:
+      - appendAssign
+    enabled-tags:
+      - diagnostic
+    disabled-tags:
+      - performance
+      - style
+      - experimental
+      - opinionated
+  stylecheck:
+    checks: ["-ST1000", "-ST1003", "-ST1020", "-ST1021", "-ST1022"]
+  goheader:
+    template: |-
+      Copyright (c) Ultraviolet
+      SPDX-License-Identifier: Apache-2.0
+
 linters:
-  default: none
+  disable-all: true
   enable:
+    - importas
+    - gocritic
+    - gosimple
+    - errcheck
+    - govet
+    - unused
+    - goconst
+    - godot
+    - godox
+    - ineffassign
+    - misspell
+    - stylecheck
+    - whitespace
+    - gci
+    - gofmt
+    - goimports
+    - loggercheck
+    - goheader
     - asasalint
     - asciicheck
     - bidichk
     - contextcheck
-    - copyloopvar
     - decorder
     - dogsled
-    - dupword
-    - errcheck
     - errchkjson
     - errname
+    - execinquery
+    - copyloopvar
     - ginkgolinter
     - gocheckcompilerdirectives
-    - goconst
-    - gocritic
-    - godot
-    - godox
-    - goheader
+    - gofumpt
     - goprintffuncname
-    - govet
     - importas
-    - ineffassign
-    - loggercheck
     - makezero
     - mirror
-    - misspell
     - nakedret
-    - staticcheck
-    - unused
-    - whitespace
-  settings:
-    gocritic:
-      enabled-checks:
-        - dupImport
-        - importShadow
-        - httpNoBody
-        - paramTypeCombine
-        - emptyStringTest
-        - builtinShadow
-        - exposedSyncMutex
-      disabled-checks:
-        - appendAssign
-      enabled-tags:
-        - diagnostic
-      disabled-tags:
-        - performance
-        - style
-        - experimental
-        - opinionated
-    goheader:
-      template: |-
-        Copyright (c) Ultraviolet
-        SPDX-License-Identifier: Apache-2.0
-    importas:
-      alias:
-        - pkg: github.com/absmach/magistrala/logger
-          alias: mglog
-      no-unaliased: true
-      no-extra-aliases: false
-    staticcheck:
-      checks:
-        - -ST1000
-        - -ST1003
-        - -ST1020
-        - -ST1021
-        - -ST1022
-  exclusions:
-    generated: lax
-    presets:
-      - comments
-      - common-false-positives
-      - legacy
-      - std-error-handling
-    rules:
-      - linters:
-          - makezero
-        text: with non-zero initialized length
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
-issues:
-  max-issues-per-linter: 10
-  max-same-issues: 10
-formatters:
-  enable:
-    - gci
-    - gofmt
-    - gofumpt
-    - goimports
-  exclusions:
-    generated: lax
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
+    - dupword

Makefile

@@ -12,7 +12,6 @@ CONFIG_DIR ?= /etc/cocos
 SERVICE_NAME ?= cocos-manager
 SERVICE_DIR ?= /etc/systemd/system
 SERVICE_FILE = init/systemd/$(SERVICE_NAME).service
-IGVM_BUILD_SCRIPT := ./scripts/igvmmeasure/igvm.sh
 
 define compile_service
 	CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) \
@@ -28,9 +27,8 @@ endef
 
 all: $(SERVICES)
 
-$(SERVICES): 
+$(SERVICES):
 	$(call compile_service,$@)
-	@if [ "$@" = "cli" ] || [ "$@" = "manager" ]; then $(MAKE) build-igvm; fi
 
 $(ATTESTATION_POLICY):
 	$(MAKE) -C ./scripts/attestation_policy
@@ -63,7 +61,3 @@ stop:
 install_service:
 	sudo install -m 644 $(SERVICE_FILE) $(SERVICE_DIR)/$(SERVICE_NAME).service
 	sudo systemctl daemon-reload
-
-build-igvm:
-	@echo "Running build script for igvmmeasure..."
-	@$(IGVM_BUILD_SCRIPT)

README.md

@@ -76,5 +76,3 @@ Cocos AI is published under the permissive open-source [Apache-2.0](LICENSE) lic
 - [Official Releases](https://github.com/ultravioletrs/cocos/releases)
 - [Confidential Computing Overview](https://confidentialcomputing.io/white-papers-reports/)
 - [Trusted Execution Environments (TEEs)](https://en.wikipedia.org/wiki/Trusted_execution_environment)
-
->This work has been partially supported by the ELASTIC project, which received funding from the Smart Networks and Services Joint Undertaking (SNS JU) under the European Union’s Horizon Europe research and innovation programme under Grant Agreement No 101139067. Views and opinions expressed are however those of the author(s) only and do not necessarily reflect those of the European Union. Neither the European Union nor the granting authority can be held responsible for them.

agent/README.md

@@ -6,16 +6,16 @@ Agent service provides a barebones HTTP and gRPC API and Service interface imple
 
 The service is configured using the environment variables from the following table. Note that any unset variables will be replaced with their default values.
 
-| Variable                       | Description                                                                                                   | Default                        |
-| ------------------------------ | ------------------------------------------------------------------------------------------------------------- | ------------------------------ |
-| AGENT_LOG_LEVEL                | Log level for agent service (debug, info, warn, error)                                                        | debug                          |
-| AGENT_CVM_GRPC_HOST            | Agent service gRPC host                                                                                       | ""                             |
-| AGENT_CVM_GRPC_PORT            | Agent service gRPC port                                                                                       | 7001                           |
-| AGENT_CVM_GRPC_SERVER_CERT     | Path to gRPC server certificate in pem format                                                                 | ""                             |
-| AGENT_CVM_GRPC_SERVER_KEY      | Path to gRPC server key in pem format                                                                         | ""                             |
-| AGENT_CVM_GRPC_SERVER_CA_CERTS | Path to gRPC server CA certificate                                                                            | ""                             |
-| AGENT_CVM_GRPC_CLIENT_CA_CERTS | Path to gRPC client CA certificate                                                                            | ""                             |
-| AGENT_CVM_CA_URL               | URL for CA service, if provided it will be used for certificate generation, used only with aTLS at the moment | ""                             |
+| Variable                      | Description                                            | Default                        |
+| ----------------------------- | ------------------------------------------------------ | ------------------------------ |
+| AGENT_LOG_LEVEL               | Log level for agent service (debug, info, warn, error) | info                           |
+| AGENT_GRPC_HOST               | Agent service gRPC host                                | ""                             |
+| AGENT_GRPC_PORT               | Agent service gRPC port                                | 7002                           |
+| AGENT_GRPC_SERVER_CERT        | Path to gRPC server certificate in pem format          | ""                             |
+| AGENT_GRPC_SERVER_KEY         | Path to gRPC server key in pem format                  | ""                             |
+| AGENT_GRPC_SERVER_CA_CERTS    | Path to gRPC server CA certificate                     | ""                             |
+| AGENT_GRPC_CLIENT_CA_CERTS    | Path to gRPC client CA certificate                     | ""                             |
+
 
 ## Deployment
 

agent/agent.pb.go

@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.5
+// 	protoc-gen-go v1.36.0
 // 	protoc        v5.29.0
 // source: agent/agent.proto
 
@@ -14,7 +14,6 @@ import (
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
-	unsafe "unsafe"
 )
 
 const (
@@ -282,9 +281,7 @@ func (x *ResultResponse) GetFile() []byte {
 
 type AttestationRequest struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
-	TeeNonce      []byte                 `protobuf:"bytes,1,opt,name=teeNonce,proto3" json:"teeNonce,omitempty"`   // Should be less or equal 64 bytes.
-	VtpmNonce     []byte                 `protobuf:"bytes,2,opt,name=vtpmNonce,proto3" json:"vtpmNonce,omitempty"` // Should be less or equal 32 bytes.
-	Type          int32                  `protobuf:"varint,3,opt,name=type,proto3" json:"type,omitempty"`
+	ReportData    []byte                 `protobuf:"bytes,1,opt,name=report_data,json=reportData,proto3" json:"report_data,omitempty"` // Should be of length 64.
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -319,27 +316,13 @@ func (*AttestationRequest) Descriptor() ([]byte, []int) {
 	return file_agent_agent_proto_rawDescGZIP(), []int{6}
 }
 
-func (x *AttestationRequest) GetTeeNonce() []byte {
+func (x *AttestationRequest) GetReportData() []byte {
 	if x != nil {
-		return x.TeeNonce
+		return x.ReportData
 	}
 	return nil
 }
 
-func (x *AttestationRequest) GetVtpmNonce() []byte {
-	if x != nil {
-		return x.VtpmNonce
-	}
-	return nil
-}
-
-func (x *AttestationRequest) GetType() int32 {
-	if x != nil {
-		return x.Type
-	}
-	return 0
-}
-
 type AttestationResponse struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	File          []byte                 `protobuf:"bytes,1,opt,name=file,proto3" json:"file,omitempty"`
@@ -384,193 +367,9 @@ func (x *AttestationResponse) GetFile() []byte {
 	return nil
 }
 
-type IMAMeasurementsRequest struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *IMAMeasurementsRequest) Reset() {
-	*x = IMAMeasurementsRequest{}
-	mi := &file_agent_agent_proto_msgTypes[8]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *IMAMeasurementsRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IMAMeasurementsRequest) ProtoMessage() {}
-
-func (x *IMAMeasurementsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_agent_proto_msgTypes[8]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IMAMeasurementsRequest.ProtoReflect.Descriptor instead.
-func (*IMAMeasurementsRequest) Descriptor() ([]byte, []int) {
-	return file_agent_agent_proto_rawDescGZIP(), []int{8}
-}
-
-type IMAMeasurementsResponse struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	File          []byte                 `protobuf:"bytes,1,opt,name=file,proto3" json:"file,omitempty"`
-	Pcr10         []byte                 `protobuf:"bytes,2,opt,name=pcr10,proto3" json:"pcr10,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *IMAMeasurementsResponse) Reset() {
-	*x = IMAMeasurementsResponse{}
-	mi := &file_agent_agent_proto_msgTypes[9]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *IMAMeasurementsResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IMAMeasurementsResponse) ProtoMessage() {}
-
-func (x *IMAMeasurementsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_agent_proto_msgTypes[9]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IMAMeasurementsResponse.ProtoReflect.Descriptor instead.
-func (*IMAMeasurementsResponse) Descriptor() ([]byte, []int) {
-	return file_agent_agent_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *IMAMeasurementsResponse) GetFile() []byte {
-	if x != nil {
-		return x.File
-	}
-	return nil
-}
-
-func (x *IMAMeasurementsResponse) GetPcr10() []byte {
-	if x != nil {
-		return x.Pcr10
-	}
-	return nil
-}
-
-type AttestationResultRequest struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	TokenNonce    []byte                 `protobuf:"bytes,1,opt,name=tokenNonce,proto3" json:"tokenNonce,omitempty"` // Should be less or equal 32 bytes
-	Type          int32                  `protobuf:"varint,3,opt,name=type,proto3" json:"type,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *AttestationResultRequest) Reset() {
-	*x = AttestationResultRequest{}
-	mi := &file_agent_agent_proto_msgTypes[10]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *AttestationResultRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AttestationResultRequest) ProtoMessage() {}
-
-func (x *AttestationResultRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_agent_proto_msgTypes[10]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AttestationResultRequest.ProtoReflect.Descriptor instead.
-func (*AttestationResultRequest) Descriptor() ([]byte, []int) {
-	return file_agent_agent_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *AttestationResultRequest) GetTokenNonce() []byte {
-	if x != nil {
-		return x.TokenNonce
-	}
-	return nil
-}
-
-func (x *AttestationResultRequest) GetType() int32 {
-	if x != nil {
-		return x.Type
-	}
-	return 0
-}
-
-type AttestationResultResponse struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	File          []byte                 `protobuf:"bytes,1,opt,name=file,proto3" json:"file,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *AttestationResultResponse) Reset() {
-	*x = AttestationResultResponse{}
-	mi := &file_agent_agent_proto_msgTypes[11]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *AttestationResultResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AttestationResultResponse) ProtoMessage() {}
-
-func (x *AttestationResultResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_agent_proto_msgTypes[11]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AttestationResultResponse.ProtoReflect.Descriptor instead.
-func (*AttestationResultResponse) Descriptor() ([]byte, []int) {
-	return file_agent_agent_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *AttestationResultResponse) GetFile() []byte {
-	if x != nil {
-		return x.File
-	}
-	return nil
-}
-
 var File_agent_agent_proto protoreflect.FileDescriptor
 
-var file_agent_agent_proto_rawDesc = string([]byte{
+var file_agent_agent_proto_rawDesc = []byte{
 	0x0a, 0x11, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x12, 0x05, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x22, 0x4f, 0x0a, 0x0b, 0x41, 0x6c,
 	0x67, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x6c, 0x67,
@@ -587,105 +386,69 @@ var file_agent_agent_proto_rawDesc = string([]byte{
 	0x22, 0x0f, 0x0a, 0x0d, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
 	0x74, 0x22, 0x24, 0x0a, 0x0e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
 	0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0c, 0x52, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x22, 0x62, 0x0a, 0x12, 0x41, 0x74, 0x74, 0x65, 0x73,
-	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a,
-	0x08, 0x74, 0x65, 0x65, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52,
-	0x08, 0x74, 0x65, 0x65, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x76, 0x74, 0x70,
-	0x6d, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x76, 0x74,
-	0x70, 0x6d, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x29, 0x0a, 0x13, 0x41,
-	0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c,
-	0x52, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x22, 0x18, 0x0a, 0x16, 0x49, 0x4d, 0x41, 0x4d, 0x65, 0x61,
-	0x73, 0x75, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x22, 0x43, 0x0a, 0x17, 0x49, 0x4d, 0x41, 0x4d, 0x65, 0x61, 0x73, 0x75, 0x72, 0x65, 0x6d, 0x65,
-	0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66,
-	0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x12,
-	0x14, 0x0a, 0x05, 0x70, 0x63, 0x72, 0x31, 0x30, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05,
-	0x70, 0x63, 0x72, 0x31, 0x30, 0x22, 0x4e, 0x0a, 0x18, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x4e, 0x6f, 0x6e, 0x63, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x4e, 0x6f, 0x6e, 0x63,
-	0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x2f, 0x0a, 0x19, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c,
-	0x52, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x32, 0xad, 0x03, 0x0a, 0x0c, 0x41, 0x67, 0x65, 0x6e, 0x74,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x33, 0x0a, 0x04, 0x41, 0x6c, 0x67, 0x6f, 0x12,
-	0x12, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x41, 0x6c, 0x67, 0x6f, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x41, 0x6c, 0x67, 0x6f,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x12, 0x33, 0x0a, 0x04,
-	0x44, 0x61, 0x74, 0x61, 0x12, 0x12, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x44, 0x61, 0x74,
-	0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x2e, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28,
-	0x01, 0x12, 0x39, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x14, 0x2e, 0x61, 0x67,
-	0x65, 0x6e, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x15, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x48, 0x0a, 0x0b,
-	0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x2e, 0x61, 0x67,
-	0x65, 0x6e, 0x74, 0x2e, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x41,
-	0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x54, 0x0a, 0x0f, 0x49, 0x4d, 0x41, 0x4d, 0x65, 0x61,
-	0x73, 0x75, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x1d, 0x2e, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x2e, 0x49, 0x4d, 0x41, 0x4d, 0x65, 0x61, 0x73, 0x75, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74,
-	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74,
-	0x2e, 0x49, 0x4d, 0x41, 0x4d, 0x65, 0x61, 0x73, 0x75, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x58, 0x0a, 0x11,
-	0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c,
-	0x74, 0x12, 0x1f, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x20, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x41, 0x74, 0x74, 0x65, 0x73,
-	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x09, 0x5a, 0x07, 0x2e, 0x2f, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-})
+	0x0c, 0x52, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x22, 0x35, 0x0a, 0x12, 0x41, 0x74, 0x74, 0x65, 0x73,
+	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f, 0x0a,
+	0x0b, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0c, 0x52, 0x0a, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x44, 0x61, 0x74, 0x61, 0x22, 0x29,
+	0x0a, 0x13, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x69, 0x6c, 0x65, 0x32, 0xfd, 0x01, 0x0a, 0x0c, 0x41, 0x67,
+	0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x33, 0x0a, 0x04, 0x41, 0x6c,
+	0x67, 0x6f, 0x12, 0x12, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x41, 0x6c, 0x67, 0x6f, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x41,
+	0x6c, 0x67, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x12,
+	0x33, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x12, 0x12, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e,
+	0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x61, 0x67,
+	0x65, 0x6e, 0x74, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x00, 0x28, 0x01, 0x12, 0x39, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x14,
+	0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x52, 0x65, 0x73,
+	0x75, 0x6c, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12,
+	0x48, 0x0a, 0x0b, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19,
+	0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x61, 0x67, 0x65, 0x6e,
+	0x74, 0x2e, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x42, 0x09, 0x5a, 0x07, 0x2e, 0x2f, 0x61,
+	0x67, 0x65, 0x6e, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
 
 var (
 	file_agent_agent_proto_rawDescOnce sync.Once
-	file_agent_agent_proto_rawDescData []byte
+	file_agent_agent_proto_rawDescData = file_agent_agent_proto_rawDesc
 )
 
 func file_agent_agent_proto_rawDescGZIP() []byte {
 	file_agent_agent_proto_rawDescOnce.Do(func() {
-		file_agent_agent_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_agent_agent_proto_rawDesc), len(file_agent_agent_proto_rawDesc)))
+		file_agent_agent_proto_rawDescData = protoimpl.X.CompressGZIP(file_agent_agent_proto_rawDescData)
 	})
 	return file_agent_agent_proto_rawDescData
 }
 
-var file_agent_agent_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
+var file_agent_agent_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
 var file_agent_agent_proto_goTypes = []any{
-	(*AlgoRequest)(nil),               // 0: agent.AlgoRequest
-	(*AlgoResponse)(nil),              // 1: agent.AlgoResponse
-	(*DataRequest)(nil),               // 2: agent.DataRequest
-	(*DataResponse)(nil),              // 3: agent.DataResponse
-	(*ResultRequest)(nil),             // 4: agent.ResultRequest
-	(*ResultResponse)(nil),            // 5: agent.ResultResponse
-	(*AttestationRequest)(nil),        // 6: agent.AttestationRequest
-	(*AttestationResponse)(nil),       // 7: agent.AttestationResponse
-	(*IMAMeasurementsRequest)(nil),    // 8: agent.IMAMeasurementsRequest
-	(*IMAMeasurementsResponse)(nil),   // 9: agent.IMAMeasurementsResponse
-	(*AttestationResultRequest)(nil),  // 10: agent.AttestationResultRequest
-	(*AttestationResultResponse)(nil), // 11: agent.AttestationResultResponse
+	(*AlgoRequest)(nil),         // 0: agent.AlgoRequest
+	(*AlgoResponse)(nil),        // 1: agent.AlgoResponse
+	(*DataRequest)(nil),         // 2: agent.DataRequest
+	(*DataResponse)(nil),        // 3: agent.DataResponse
+	(*ResultRequest)(nil),       // 4: agent.ResultRequest
+	(*ResultResponse)(nil),      // 5: agent.ResultResponse
+	(*AttestationRequest)(nil),  // 6: agent.AttestationRequest
+	(*AttestationResponse)(nil), // 7: agent.AttestationResponse
 }
 var file_agent_agent_proto_depIdxs = []int32{
-	0,  // 0: agent.AgentService.Algo:input_type -> agent.AlgoRequest
-	2,  // 1: agent.AgentService.Data:input_type -> agent.DataRequest
-	4,  // 2: agent.AgentService.Result:input_type -> agent.ResultRequest
-	6,  // 3: agent.AgentService.Attestation:input_type -> agent.AttestationRequest
-	8,  // 4: agent.AgentService.IMAMeasurements:input_type -> agent.IMAMeasurementsRequest
-	10, // 5: agent.AgentService.AttestationResult:input_type -> agent.AttestationResultRequest
-	1,  // 6: agent.AgentService.Algo:output_type -> agent.AlgoResponse
-	3,  // 7: agent.AgentService.Data:output_type -> agent.DataResponse
-	5,  // 8: agent.AgentService.Result:output_type -> agent.ResultResponse
-	7,  // 9: agent.AgentService.Attestation:output_type -> agent.AttestationResponse
-	9,  // 10: agent.AgentService.IMAMeasurements:output_type -> agent.IMAMeasurementsResponse
-	11, // 11: agent.AgentService.AttestationResult:output_type -> agent.AttestationResultResponse
-	6,  // [6:12] is the sub-list for method output_type
-	0,  // [0:6] is the sub-list for method input_type
-	0,  // [0:0] is the sub-list for extension type_name
-	0,  // [0:0] is the sub-list for extension extendee
-	0,  // [0:0] is the sub-list for field type_name
+	0, // 0: agent.AgentService.Algo:input_type -> agent.AlgoRequest
+	2, // 1: agent.AgentService.Data:input_type -> agent.DataRequest
+	4, // 2: agent.AgentService.Result:input_type -> agent.ResultRequest
+	6, // 3: agent.AgentService.Attestation:input_type -> agent.AttestationRequest
+	1, // 4: agent.AgentService.Algo:output_type -> agent.AlgoResponse
+	3, // 5: agent.AgentService.Data:output_type -> agent.DataResponse
+	5, // 6: agent.AgentService.Result:output_type -> agent.ResultResponse
+	7, // 7: agent.AgentService.Attestation:output_type -> agent.AttestationResponse
+	4, // [4:8] is the sub-list for method output_type
+	0, // [0:4] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
 }
 
 func init() { file_agent_agent_proto_init() }
@@ -697,9 +460,9 @@ func file_agent_agent_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_agent_agent_proto_rawDesc), len(file_agent_agent_proto_rawDesc)),
+			RawDescriptor: file_agent_agent_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   12,
+			NumMessages:   8,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
@@ -708,6 +471,7 @@ func file_agent_agent_proto_init() {
 		MessageInfos:      file_agent_agent_proto_msgTypes,
 	}.Build()
 	File_agent_agent_proto = out.File
+	file_agent_agent_proto_rawDesc = nil
 	file_agent_agent_proto_goTypes = nil
 	file_agent_agent_proto_depIdxs = nil
 }

agent/agent.proto

@@ -12,8 +12,6 @@ service AgentService {
   rpc Data(stream DataRequest) returns (DataResponse) {}
   rpc Result(ResultRequest) returns (stream ResultResponse) {}
   rpc Attestation(AttestationRequest) returns (stream AttestationResponse) {}
-  rpc IMAMeasurements(IMAMeasurementsRequest) returns (stream IMAMeasurementsResponse) {}
-  rpc AttestationResult(AttestationResultRequest) returns (AttestationResultResponse) {}
 }
 
 message AlgoRequest {
@@ -38,27 +36,9 @@ message ResultResponse {
 }
 
 message AttestationRequest {
-  bytes teeNonce = 1; // Should be less or equal 64 bytes.
-  bytes vtpmNonce = 2; // Should be less or equal 32 bytes.
-  int32 type = 3;
+  bytes report_data = 1; // Should be of length 64.
 }
 
 message AttestationResponse {
   bytes file = 1;
 }
-
-message IMAMeasurementsRequest {
-}
-
-message IMAMeasurementsResponse {
-  bytes file = 1;
-  bytes pcr10 = 2;
-}
-
-message AttestationResultRequest{
-  bytes tokenNonce = 1; // Should be less or equal 32 bytes
-  int32 type = 3;
-}
-message AttestationResultResponse{
-  bytes file = 1;
-}

agent/agent_grpc.pb.go

@@ -22,12 +22,10 @@ import (
 const _ = grpc.SupportPackageIsVersion9
 
 const (
-	AgentService_Algo_FullMethodName              = "/agent.AgentService/Algo"
-	AgentService_Data_FullMethodName              = "/agent.AgentService/Data"
-	AgentService_Result_FullMethodName            = "/agent.AgentService/Result"
-	AgentService_Attestation_FullMethodName       = "/agent.AgentService/Attestation"
-	AgentService_IMAMeasurements_FullMethodName   = "/agent.AgentService/IMAMeasurements"
-	AgentService_AttestationResult_FullMethodName = "/agent.AgentService/AttestationResult"
+	AgentService_Algo_FullMethodName        = "/agent.AgentService/Algo"
+	AgentService_Data_FullMethodName        = "/agent.AgentService/Data"
+	AgentService_Result_FullMethodName      = "/agent.AgentService/Result"
+	AgentService_Attestation_FullMethodName = "/agent.AgentService/Attestation"
 )
 
 // AgentServiceClient is the client API for AgentService service.
@@ -38,8 +36,6 @@ type AgentServiceClient interface {
 	Data(ctx context.Context, opts ...grpc.CallOption) (grpc.ClientStreamingClient[DataRequest, DataResponse], error)
 	Result(ctx context.Context, in *ResultRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[ResultResponse], error)
 	Attestation(ctx context.Context, in *AttestationRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[AttestationResponse], error)
-	IMAMeasurements(ctx context.Context, in *IMAMeasurementsRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[IMAMeasurementsResponse], error)
-	AttestationResult(ctx context.Context, in *AttestationResultRequest, opts ...grpc.CallOption) (*AttestationResultResponse, error)
 }
 
 type agentServiceClient struct {
@@ -114,35 +110,6 @@ func (c *agentServiceClient) Attestation(ctx context.Context, in *AttestationReq
 // This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
 type AgentService_AttestationClient = grpc.ServerStreamingClient[AttestationResponse]
 
-func (c *agentServiceClient) IMAMeasurements(ctx context.Context, in *IMAMeasurementsRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[IMAMeasurementsResponse], error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	stream, err := c.cc.NewStream(ctx, &AgentService_ServiceDesc.Streams[4], AgentService_IMAMeasurements_FullMethodName, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &grpc.GenericClientStream[IMAMeasurementsRequest, IMAMeasurementsResponse]{ClientStream: stream}
-	if err := x.ClientStream.SendMsg(in); err != nil {
-		return nil, err
-	}
-	if err := x.ClientStream.CloseSend(); err != nil {
-		return nil, err
-	}
-	return x, nil
-}
-
-// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
-type AgentService_IMAMeasurementsClient = grpc.ServerStreamingClient[IMAMeasurementsResponse]
-
-func (c *agentServiceClient) AttestationResult(ctx context.Context, in *AttestationResultRequest, opts ...grpc.CallOption) (*AttestationResultResponse, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(AttestationResultResponse)
-	err := c.cc.Invoke(ctx, AgentService_AttestationResult_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 // AgentServiceServer is the server API for AgentService service.
 // All implementations must embed UnimplementedAgentServiceServer
 // for forward compatibility.
@@ -151,8 +118,6 @@ type AgentServiceServer interface {
 	Data(grpc.ClientStreamingServer[DataRequest, DataResponse]) error
 	Result(*ResultRequest, grpc.ServerStreamingServer[ResultResponse]) error
 	Attestation(*AttestationRequest, grpc.ServerStreamingServer[AttestationResponse]) error
-	IMAMeasurements(*IMAMeasurementsRequest, grpc.ServerStreamingServer[IMAMeasurementsResponse]) error
-	AttestationResult(context.Context, *AttestationResultRequest) (*AttestationResultResponse, error)
 	mustEmbedUnimplementedAgentServiceServer()
 }
 
@@ -175,12 +140,6 @@ func (UnimplementedAgentServiceServer) Result(*ResultRequest, grpc.ServerStreami
 func (UnimplementedAgentServiceServer) Attestation(*AttestationRequest, grpc.ServerStreamingServer[AttestationResponse]) error {
 	return status.Errorf(codes.Unimplemented, "method Attestation not implemented")
 }
-func (UnimplementedAgentServiceServer) IMAMeasurements(*IMAMeasurementsRequest, grpc.ServerStreamingServer[IMAMeasurementsResponse]) error {
-	return status.Errorf(codes.Unimplemented, "method IMAMeasurements not implemented")
-}
-func (UnimplementedAgentServiceServer) AttestationResult(context.Context, *AttestationResultRequest) (*AttestationResultResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method AttestationResult not implemented")
-}
 func (UnimplementedAgentServiceServer) mustEmbedUnimplementedAgentServiceServer() {}
 func (UnimplementedAgentServiceServer) testEmbeddedByValue()                      {}
 
@@ -238,47 +197,13 @@ func _AgentService_Attestation_Handler(srv interface{}, stream grpc.ServerStream
 // This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
 type AgentService_AttestationServer = grpc.ServerStreamingServer[AttestationResponse]
 
-func _AgentService_IMAMeasurements_Handler(srv interface{}, stream grpc.ServerStream) error {
-	m := new(IMAMeasurementsRequest)
-	if err := stream.RecvMsg(m); err != nil {
-		return err
-	}
-	return srv.(AgentServiceServer).IMAMeasurements(m, &grpc.GenericServerStream[IMAMeasurementsRequest, IMAMeasurementsResponse]{ServerStream: stream})
-}
-
-// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
-type AgentService_IMAMeasurementsServer = grpc.ServerStreamingServer[IMAMeasurementsResponse]
-
-func _AgentService_AttestationResult_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(AttestationResultRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(AgentServiceServer).AttestationResult(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: AgentService_AttestationResult_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(AgentServiceServer).AttestationResult(ctx, req.(*AttestationResultRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 // AgentService_ServiceDesc is the grpc.ServiceDesc for AgentService service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
 var AgentService_ServiceDesc = grpc.ServiceDesc{
 	ServiceName: "agent.AgentService",
 	HandlerType: (*AgentServiceServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "AttestationResult",
-			Handler:    _AgentService_AttestationResult_Handler,
-		},
-	},
+	Methods:     []grpc.MethodDesc{},
 	Streams: []grpc.StreamDesc{
 		{
 			StreamName:    "Algo",
@@ -300,11 +225,6 @@ var AgentService_ServiceDesc = grpc.ServiceDesc{
 			Handler:       _AgentService_Attestation_Handler,
 			ServerStreams: true,
 		},
-		{
-			StreamName:    "IMAMeasurements",
-			Handler:       _AgentService_IMAMeasurements_Handler,
-			ServerStreams: true,
-		},
 	},
 	Metadata: "agent/agent.proto",
 }

agent/algorithm/binary/binary.go

@@ -57,10 +57,6 @@ func (b *binary) Stop() error {
 		return nil
 	}
 
-	if b.cmd.Process == nil {
-		return nil
-	}
-
 	if err := b.cmd.Process.Kill(); err != nil {
 		return fmt.Errorf("error stopping algorithm: %v", err)
 	}

agent/algorithm/docker/docker.go

@@ -62,7 +62,7 @@ func (d *docker) Run() error {
 
 	ctx := context.Background()
 	// Load the Docker image from the tar file.
-	resp, err := cli.ImageLoad(ctx, imageFile, client.ImageLoadWithQuiet(true))
+	resp, err := cli.ImageLoad(ctx, imageFile, true)
 	if err != nil {
 		return fmt.Errorf("could not load Docker image from file: %v", err)
 	}

agent/algorithm/python/python.go

@@ -114,10 +114,6 @@ func (p *python) Stop() error {
 		return nil
 	}
 
-	if p.cmd.Process == nil {
-		return nil
-	}
-
 	if err := p.cmd.Process.Kill(); err != nil {
 		return fmt.Errorf("error stopping algorithm: %v", err)
 	}

agent/algorithm/wasm/wasm.go

@@ -63,10 +63,6 @@ func (w *wasm) Stop() error {
 		return nil
 	}
 
-	if w.cmd.Process == nil {
-		return nil
-	}
-
 	if err := w.cmd.Process.Kill(); err != nil {
 		return fmt.Errorf("error stopping algorithm: %v", err)
 	}

agent/api/grpc/endpoint.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/go-kit/kit/endpoint"
 	"github.com/ultravioletrs/cocos/agent"
-	"github.com/ultravioletrs/cocos/pkg/attestation"
 )
 
 func algoEndpoint(svc agent.Service) endpoint.Endpoint {
@@ -71,7 +70,7 @@ func attestationEndpoint(svc agent.Service) endpoint.Endpoint {
 		if err := req.validate(); err != nil {
 			return attestationRes{}, err
 		}
-		file, err := svc.Attestation(ctx, req.TeeNonce, req.VtpmNonce, attestation.PlatformType(req.AttType))
+		file, err := svc.Attestation(ctx, req.ReportData)
 		if err != nil {
 			return attestationRes{}, err
 		}
@@ -79,33 +78,3 @@ func attestationEndpoint(svc agent.Service) endpoint.Endpoint {
 		return attestationRes{File: file}, nil
 	}
 }
-
-func imaMeasurementsEndpoint(svc agent.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(imaMeasurementsReq)
-
-		if err := req.validate(); err != nil {
-			return imaMeasurementsRes{}, err
-		}
-		file, pcr10, err := svc.IMAMeasurements(ctx)
-		if err != nil {
-			return imaMeasurementsRes{}, err
-		}
-
-		return imaMeasurementsRes{File: file, PCR10: pcr10}, nil
-	}
-}
-
-func attestationResultEndpoint(svc agent.Service) endpoint.Endpoint {
-	return func(ctx context.Context, request interface{}) (interface{}, error) {
-		req := request.(FetchAttestationResultReq)
-		if err := req.validate(); err != nil {
-			return fetchAttestationResultRes{}, err
-		}
-		file, err := svc.AttestationResult(ctx, req.tokenNonce, attestation.PlatformType(req.AttType))
-		if err != nil {
-			return fetchAttestationResultRes{}, err
-		}
-		return fetchAttestationResultRes{File: file}, nil
-	}
-}

agent/api/grpc/endpoint_test.go

@@ -7,10 +7,8 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/stretchr/testify/mock"
 	"github.com/ultravioletrs/cocos/agent"
 	"github.com/ultravioletrs/cocos/agent/mocks"
-	"github.com/ultravioletrs/cocos/pkg/attestation"
 	"golang.org/x/crypto/sha3"
 )
 
@@ -143,11 +141,11 @@ func TestAttestationEndpoint(t *testing.T) {
 	}{
 		{
 			name: "Success",
-			req:  attestationReq{TeeNonce: sha3.Sum512([]byte("report data")), VtpmNonce: sha3.Sum256([]byte("vtpm nonce")), AttType: attestation.SNP},
+			req:  attestationReq{ReportData: sha3.Sum512([]byte("report data"))},
 		},
 		{
 			name:        "Service Error",
-			req:         attestationReq{TeeNonce: sha3.Sum512([]byte("report data")), VtpmNonce: sha3.Sum256([]byte("vtpm nonce")), AttType: attestation.SNP},
+			req:         attestationReq{ReportData: sha3.Sum512([]byte("report data"))},
 			expectedErr: true,
 		},
 	}
@@ -155,9 +153,9 @@ func TestAttestationEndpoint(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			if tt.name == svcErr {
-				svc.On("Attestation", context.Background(), tt.req.TeeNonce, tt.req.VtpmNonce, tt.req.AttType).Return([]byte{}, errors.New("")).Once()
+				svc.On("Attestation", context.Background(), tt.req.ReportData).Return([]byte{}, errors.New("")).Once()
 			} else {
-				svc.On("Attestation", context.Background(), tt.req.TeeNonce, tt.req.VtpmNonce, tt.req.AttType).Return([]byte{}, nil).Once()
+				svc.On("Attestation", context.Background(), tt.req.ReportData).Return([]byte{}, nil).Once()
 			}
 			endpoint := attestationEndpoint(svc)
 			res, err := endpoint(context.Background(), tt.req)
@@ -173,55 +171,3 @@ func TestAttestationEndpoint(t *testing.T) {
 		})
 	}
 }
-
-func TestAttestationResultEndpoint(t *testing.T) {
-	svc := new(mocks.Service)
-	tests := []struct {
-		name        string
-		req         FetchAttestationResultReq
-		mockErr     error
-		expectedErr bool
-	}{
-		{
-			name:        "Success",
-			req:         FetchAttestationResultReq{tokenNonce: sha3.Sum256([]byte("vtpm nonce")), AttType: attestation.AzureToken},
-			mockErr:     nil,
-			expectedErr: false,
-		},
-		{
-			name:        "Service Error",
-			req:         FetchAttestationResultReq{tokenNonce: sha3.Sum256([]byte("vtpm nonce")), AttType: attestation.AzureToken},
-			mockErr:     errors.New("mock failure"),
-			expectedErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Only call service mock if validation is expected to pass
-			if err := tt.req.validate(); err == nil {
-				svc.On("AttestationResult", mock.Anything, tt.req.tokenNonce, attestation.PlatformType(tt.req.AttType)).
-					Return([]byte("mock file"), tt.mockErr).Once()
-			}
-
-			endpoint := attestationResultEndpoint(svc)
-			res, err := endpoint(context.Background(), tt.req)
-
-			if (err != nil) != tt.expectedErr {
-				t.Errorf("attestationResultEndpoint() error = %v, expectedErr %v", err, tt.expectedErr)
-			}
-
-			if !tt.expectedErr {
-				r, ok := res.(fetchAttestationResultRes)
-				if !ok {
-					t.Errorf("attestationResultEndpoint() returned unexpected type %T", res)
-				}
-				if string(r.File) != "mock file" {
-					t.Errorf("expected file content 'mock file', got %s", r.File)
-				}
-			}
-
-			svc.AssertExpectations(t)
-		})
-	}
-}

agent/api/grpc/requests.go

@@ -4,10 +4,6 @@ package grpc
 
 import (
 	"errors"
-
-	"github.com/ultravioletrs/cocos/pkg/attestation"
-	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider"
-	"github.com/ultravioletrs/cocos/pkg/attestation/vtpm"
 )
 
 type algoReq struct {
@@ -42,36 +38,9 @@ func (req resultReq) validate() error {
 }
 
 type attestationReq struct {
-	TeeNonce  [quoteprovider.Nonce]byte
-	VtpmNonce [vtpm.Nonce]byte
-	AttType   attestation.PlatformType
-}
-
-type FetchAttestationResultReq struct {
-	tokenNonce [vtpm.Nonce]byte
-	AttType    attestation.PlatformType
+	ReportData [64]byte
 }
 
 func (req attestationReq) validate() error {
-	return validateAttestationType(req.AttType)
-}
-
-func (req FetchAttestationResultReq) validate() error {
-	return validateAttestationType(req.AttType)
-}
-
-func validateAttestationType(attType attestation.PlatformType) error {
-	switch attType {
-	case attestation.SNP, attestation.VTPM, attestation.SNPvTPM, attestation.AzureToken:
-		return nil
-	default:
-		return errors.New("invalid attestation type")
-	}
-}
-
-type imaMeasurementsReq struct{}
-
-func (req imaMeasurementsReq) validate() error {
-	// No request parameters to validate, so no validation logic needed
 	return nil
 }

agent/api/grpc/responses.go

@@ -13,12 +13,3 @@ type resultRes struct {
 type attestationRes struct {
 	File []byte
 }
-
-type imaMeasurementsRes struct {
-	File  []byte
-	PCR10 []byte
-}
-
-type fetchAttestationResultRes struct {
-	File []byte `protobuf:"bytes,1,opt,name=AttestationResult,proto3" json:"AttestationResult,omitempty"`
-}

agent/api/grpc/server.go

@@ -8,13 +8,9 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"strconv"
 
 	"github.com/go-kit/kit/transport/grpc"
 	"github.com/ultravioletrs/cocos/agent"
-	"github.com/ultravioletrs/cocos/pkg/attestation"
-	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider"
-	"github.com/ultravioletrs/cocos/pkg/attestation/vtpm"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
@@ -25,21 +21,13 @@ const (
 	FileSizeKey = "file-size"
 )
 
-var (
-	ErrTEENonceLength   = errors.New("malformed report data, expect less or equal to 64 bytes")
-	ErrVTPMNonceLength  = errors.New("malformed vTPM nonce, expect less or equal to 32 bytes")
-	ErrTokenNonceLength = errors.New("malformed token nonce, expect less or equal to 32 bytes")
-)
-
 var _ agent.AgentServiceServer = (*grpcServer)(nil)
 
 type grpcServer struct {
-	algo              grpc.Handler
-	data              grpc.Handler
-	result            grpc.Handler
-	attestation       grpc.Handler
-	imaMeasurements   grpc.Handler
-	attestationResult grpc.Handler
+	algo        grpc.Handler
+	data        grpc.Handler
+	result      grpc.Handler
+	attestation grpc.Handler
 	agent.UnimplementedAgentServiceServer
 }
 
@@ -66,16 +54,6 @@ func NewServer(svc agent.Service) agent.AgentServiceServer {
 			decodeAttestationRequest,
 			encodeAttestationResponse,
 		),
-		imaMeasurements: grpc.NewServer(
-			imaMeasurementsEndpoint(svc),
-			decodeIMAMeasurementsRequest,
-			encodeIMAMeasurementsResponse,
-		),
-		attestationResult: grpc.NewServer(
-			attestationResultEndpoint(svc),
-			decodeAttestationResultRequest,
-			encodeAttestationResultResponse,
-		),
 	}
 }
 
@@ -118,20 +96,10 @@ func encodeResultResponse(_ context.Context, response interface{}) (interface{},
 
 func decodeAttestationRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
 	req := grpcReq.(*agent.AttestationRequest)
-	var reportData [quoteprovider.Nonce]byte
-	var nonce [vtpm.Nonce]byte
-
-	if len(req.TeeNonce) > quoteprovider.Nonce {
-		return nil, ErrTEENonceLength
+	if len(req.ReportData) != agent.ReportDataSize {
+		return nil, errors.New("malformed report data, expect 64 bytes")
 	}
-
-	if len(req.VtpmNonce) > vtpm.Nonce {
-		return nil, ErrVTPMNonceLength
-	}
-
-	copy(reportData[:], req.TeeNonce)
-	copy(nonce[:], req.VtpmNonce)
-	return attestationReq{TeeNonce: reportData, VtpmNonce: nonce, AttType: attestation.PlatformType(req.Type)}, nil
+	return attestationReq{ReportData: [agent.ReportDataSize]byte(req.ReportData)}, nil
 }
 
 func encodeAttestationResponse(_ context.Context, response interface{}) (interface{}, error) {
@@ -141,25 +109,6 @@ func encodeAttestationResponse(_ context.Context, response interface{}) (interfa
 	}, nil
 }
 
-func encodeAttestationResultResponse(_ context.Context, response interface{}) (interface{}, error) {
-	res := response.(fetchAttestationResultRes)
-	return &agent.AttestationResultResponse{
-		File: res.File,
-	}, nil
-}
-
-func decodeAttestationResultRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
-	req := grpcReq.(*agent.AttestationResultRequest)
-	var nonce [vtpm.Nonce]byte
-
-	if len(req.TokenNonce) > vtpm.Nonce {
-		return nil, ErrVTPMNonceLength
-	}
-
-	copy(nonce[:], req.TokenNonce)
-	return FetchAttestationResultReq{tokenNonce: nonce, AttType: attestation.PlatformType(req.Type)}, nil
-}
-
 // Algo implements agent.AgentServiceServer.
 func (s *grpcServer) Algo(stream agent.AgentService_AlgoServer) error {
 	var algoFile, reqFile []byte
@@ -268,70 +217,3 @@ func (s *grpcServer) Attestation(req *agent.AttestationRequest, stream agent.Age
 
 	return nil
 }
-
-func decodeIMAMeasurementsRequest(_ context.Context, grpcReq interface{}) (interface{}, error) {
-	return imaMeasurementsReq{}, nil
-}
-
-func encodeIMAMeasurementsResponse(_ context.Context, response interface{}) (interface{}, error) {
-	res := response.(imaMeasurementsRes)
-	return &agent.IMAMeasurementsResponse{
-		File:  res.File,
-		Pcr10: res.PCR10,
-	}, nil
-}
-
-func (s *grpcServer) IMAMeasurements(req *agent.IMAMeasurementsRequest, stream agent.AgentService_IMAMeasurementsServer) error {
-	_, res, err := s.imaMeasurements.ServeGRPC(stream.Context(), req)
-	if err != nil {
-		return err
-	}
-	rr := res.(*agent.IMAMeasurementsResponse)
-
-	if err := stream.SetHeader(metadata.New(map[string]string{FileSizeKey: strconv.Itoa(len(rr.File))})); err != nil {
-		return status.Error(codes.Internal, err.Error())
-	}
-
-	imaBuff := bytes.NewBuffer(rr.File)
-	pcr10Buff := bytes.NewBuffer(rr.Pcr10)
-
-	imaResBuff := make([]byte, bufferSize)
-	pcr10ResBuff := make([]byte, bufferSize)
-
-	for {
-		nIma, errIma := imaBuff.Read(imaResBuff)
-		if errIma != nil && errIma != io.EOF {
-			return status.Error(codes.Internal, errIma.Error())
-		}
-
-		nPcr, errPcr := pcr10Buff.Read(pcr10ResBuff)
-		if errPcr != nil && errPcr != io.EOF {
-			return status.Error(codes.Internal, errPcr.Error())
-		}
-
-		if nIma == 0 && errIma == io.EOF &&
-			nPcr == 0 && errPcr == io.EOF {
-			break
-		}
-
-		if err := stream.Send(&agent.IMAMeasurementsResponse{File: imaResBuff[:nIma], Pcr10: pcr10ResBuff[:nPcr]}); err != nil {
-			return status.Error(codes.Internal, err.Error())
-		}
-	}
-
-	return nil
-}
-
-func (s *grpcServer) AttestationResult(ctx context.Context, req *agent.AttestationResultRequest) (*agent.AttestationResultResponse, error) {
-	_, res, err := s.attestationResult.ServeGRPC(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-	rr, ok := res.(*agent.AttestationResultResponse)
-
-	if !ok {
-		return nil, status.Error(codes.Internal, "failed to cast response to FetchAttestationResultResponse")
-	}
-
-	return rr, nil
-}

agent/api/grpc/server_test.go

@@ -11,9 +11,6 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/ultravioletrs/cocos/agent"
 	"github.com/ultravioletrs/cocos/agent/mocks"
-	"github.com/ultravioletrs/cocos/pkg/attestation"
-	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider"
-	"github.com/ultravioletrs/cocos/pkg/attestation/vtpm"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )
@@ -154,32 +151,15 @@ func TestAttestation(t *testing.T) {
 	mockStream := &MockAgentService_AttestationServer{ctx: context.Background()}
 	mockStream.On("Send", mock.AnythingOfType("*agent.AttestationResponse")).Return(nil)
 
-	reportData := [quoteprovider.Nonce]byte{}
-	vtpmNonce := [vtpm.Nonce]byte{}
-	attestationType := attestation.SNP
-	mockService.On("Attestation", mock.Anything, reportData, vtpmNonce, attestationType).Return([]byte("attestation data"), nil)
+	reportData := [agent.ReportDataSize]byte{}
+	mockService.On("Attestation", mock.Anything, reportData).Return([]byte("attestation data"), nil)
 
-	err := server.Attestation(&agent.AttestationRequest{TeeNonce: reportData[:]}, mockStream)
+	err := server.Attestation(&agent.AttestationRequest{ReportData: reportData[:]}, mockStream)
 	assert.NoError(t, err)
 
 	mockService.AssertExpectations(t)
 }
 
-func TestAttestationResult(t *testing.T) {
-	mockService := new(mocks.Service)
-	server := NewServer(mockService)
-
-	vtpmNonce := [vtpm.Nonce]byte{}
-	attestationType := attestation.SNP
-	mockService.On("AttestationResult", mock.Anything, vtpmNonce, attestationType).Return([]byte("attestation data"), nil)
-
-	resp, err := server.AttestationResult(context.Background(), &agent.AttestationResultRequest{TokenNonce: vtpmNonce[:]})
-	assert.NoError(t, err)
-	assert.Equal(t, []byte("attestation data"), resp.File)
-
-	mockService.AssertExpectations(t)
-}
-
 func TestDecodeAlgoRequest(t *testing.T) {
 	req := &agent.AlgoRequest{Algorithm: []byte("algo"), Requirements: []byte("req")}
 	decoded, err := decodeAlgoRequest(context.Background(), req)
@@ -219,11 +199,11 @@ func TestEncodeResultResponse(t *testing.T) {
 }
 
 func TestDecodeAttestationRequest(t *testing.T) {
-	nonce := [quoteprovider.Nonce]byte{}
-	req := &agent.AttestationRequest{TeeNonce: nonce[:]}
+	reportData := [agent.ReportDataSize]byte{}
+	req := &agent.AttestationRequest{ReportData: reportData[:]}
 	decoded, err := decodeAttestationRequest(context.Background(), req)
 	assert.NoError(t, err)
-	assert.Equal(t, attestationReq{TeeNonce: nonce}, decoded)
+	assert.Equal(t, attestationReq{ReportData: reportData}, decoded)
 }
 
 func TestEncodeAttestationResponse(t *testing.T) {
@@ -231,17 +211,3 @@ func TestEncodeAttestationResponse(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, &agent.AttestationResponse{File: []byte("attestation")}, encoded)
 }
-
-func TestEncodeAttestationResultResponse(t *testing.T) {
-	encoded, err := encodeAttestationResultResponse(context.Background(), fetchAttestationResultRes{File: []byte("attestation")})
-	assert.NoError(t, err)
-	assert.Equal(t, &agent.AttestationResultResponse{File: []byte("attestation")}, encoded)
-}
-
-func TestDecodeAttestationResultRequest(t *testing.T) {
-	nonce := [vtpm.Nonce]byte{}
-	req := &agent.AttestationResultRequest{TokenNonce: nonce[:]}
-	decoded, err := decodeAttestationResultRequest(context.Background(), req)
-	assert.NoError(t, err)
-	assert.Equal(t, FetchAttestationResultReq{tokenNonce: nonce}, decoded)
-}

agent/api/logging.go

@@ -13,9 +13,6 @@ import (
 	"time"
 
 	"github.com/ultravioletrs/cocos/agent"
-	"github.com/ultravioletrs/cocos/pkg/attestation"
-	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider"
-	"github.com/ultravioletrs/cocos/pkg/attestation/vtpm"
 )
 
 var _ agent.Service = (*loggingMiddleware)(nil)
@@ -30,15 +27,6 @@ func LoggingMiddleware(svc agent.Service, logger *slog.Logger) agent.Service {
 	return &loggingMiddleware{logger, svc}
 }
 
-// State implements agent.Service.
-func (lm *loggingMiddleware) State() (state string) {
-	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method State took %s to complete with state %s", time.Since(begin), state)
-		lm.logger.Debug(message)
-	}(time.Now())
-	return lm.svc.State()
-}
-
 // InitComputation implements agent.Service.
 func (lm *loggingMiddleware) InitComputation(ctx context.Context, cmp agent.Computation) (err error) {
 	defer func(begin time.Time) {
@@ -106,7 +94,7 @@ func (lm *loggingMiddleware) Result(ctx context.Context) (response []byte, err e
 	return lm.svc.Result(ctx)
 }
 
-func (lm *loggingMiddleware) Attestation(ctx context.Context, reportData [quoteprovider.Nonce]byte, nonce [vtpm.Nonce]byte, attType attestation.PlatformType) (response []byte, err error) {
+func (lm *loggingMiddleware) Attestation(ctx context.Context, reportData [agent.ReportDataSize]byte) (response []byte, err error) {
 	defer func(begin time.Time) {
 		message := fmt.Sprintf("Method Attestation took %s to complete", time.Since(begin))
 		if err != nil {
@@ -116,31 +104,5 @@ func (lm *loggingMiddleware) Attestation(ctx context.Context, reportData [quotep
 		lm.logger.Info(fmt.Sprintf("%s without errors", message))
 	}(time.Now())
 
-	return lm.svc.Attestation(ctx, reportData, nonce, attType)
-}
-
-func (lm *loggingMiddleware) IMAMeasurements(ctx context.Context) (file []byte, pcr10 []byte, err error) {
-	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method IMAMeasurements took %s to complete", time.Since(begin))
-		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s", message, err))
-			return
-		}
-		lm.logger.Info(fmt.Sprintf("%s without errors", message))
-	}(time.Now())
-
-	return lm.svc.IMAMeasurements(ctx)
-}
-
-func (lm *loggingMiddleware) AttestationResult(ctx context.Context, nonce [vtpm.Nonce]byte, attType attestation.PlatformType) (response []byte, err error) {
-	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method AttestationResult took %s to complete", time.Since(begin))
-		if err != nil {
-			lm.logger.Warn(fmt.Sprintf("%s with error: %s", message, err))
-			return
-		}
-		lm.logger.Info(fmt.Sprintf("%s without errors", message))
-	}(time.Now())
-
-	return lm.svc.AttestationResult(ctx, nonce, attType)
+	return lm.svc.Attestation(ctx, reportData)
 }

agent/api/metrics.go

@@ -12,9 +12,6 @@ import (
 
 	"github.com/go-kit/kit/metrics"
 	"github.com/ultravioletrs/cocos/agent"
-	"github.com/ultravioletrs/cocos/pkg/attestation"
-	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider"
-	"github.com/ultravioletrs/cocos/pkg/attestation/vtpm"
 )
 
 var _ agent.Service = (*metricsMiddleware)(nil)
@@ -35,16 +32,6 @@ func MetricsMiddleware(svc agent.Service, counter metrics.Counter, latency metri
 	}
 }
 
-// State implements agent.Service.
-func (ms *metricsMiddleware) State() string {
-	defer func(begin time.Time) {
-		ms.counter.With("method", "state").Add(1)
-		ms.latency.With("method", "state").Observe(time.Since(begin).Seconds())
-	}(time.Now())
-
-	return ms.svc.State()
-}
-
 // InitComputation implements agent.Service.
 func (ms *metricsMiddleware) InitComputation(ctx context.Context, cmp agent.Computation) error {
 	defer func(begin time.Time) {
@@ -92,29 +79,11 @@ func (ms *metricsMiddleware) Result(ctx context.Context) ([]byte, error) {
 	return ms.svc.Result(ctx)
 }
 
-func (ms *metricsMiddleware) Attestation(ctx context.Context, reportData [quoteprovider.Nonce]byte, nonce [vtpm.Nonce]byte, attType attestation.PlatformType) ([]byte, error) {
+func (ms *metricsMiddleware) Attestation(ctx context.Context, reportData [agent.ReportDataSize]byte) ([]byte, error) {
 	defer func(begin time.Time) {
 		ms.counter.With("method", "attestation").Add(1)
 		ms.latency.With("method", "attestation").Observe(time.Since(begin).Seconds())
 	}(time.Now())
 
-	return ms.svc.Attestation(ctx, reportData, nonce, attType)
-}
-
-func (ms *metricsMiddleware) AttestationResult(ctx context.Context, nonce [vtpm.Nonce]byte, attType attestation.PlatformType) ([]byte, error) {
-	defer func(begin time.Time) {
-		ms.counter.With("method", "attestation_result").Add(1)
-		ms.latency.With("method", "attestation_result").Observe(time.Since(begin).Seconds())
-	}(time.Now())
-
-	return ms.svc.AttestationResult(ctx, nonce, attType)
-}
-
-func (ms *metricsMiddleware) IMAMeasurements(ctx context.Context) ([]byte, []byte, error) {
-	defer func(begin time.Time) {
-		ms.counter.With("method", "imameasurements").Add(1)
-		ms.latency.With("method", "imameasurements").Observe(time.Since(begin).Seconds())
-	}(time.Now())
-
-	return ms.svc.IMAMeasurements(ctx)
+	return ms.svc.Attestation(ctx, reportData)
 }

agent/auth/mocks/auth.go

@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0
 
-// Code generated by mockery v2.53.3. DO NOT EDIT.
+// Code generated by mockery v2.43.2. DO NOT EDIT.
 
 package mocks
 

agent/computations.go

@@ -13,6 +13,7 @@ import (
 var _ fmt.Stringer = (*Datasets)(nil)
 
 type AgentConfig struct {
+	Host         string `json:"host,omitempty"`
 	Port         string `json:"port,omitempty"`
 	CertFile     string `json:"cert_file,omitempty"`
 	KeyFile      string `json:"server_key,omitempty"`

agent/computations_test.go

@@ -106,6 +106,7 @@ func TestDecompressToContext(t *testing.T) {
 
 func TestAgentConfigJSON(t *testing.T) {
 	config := AgentConfig{
+		Host:         "localhost",
 		Port:         "8080",
 		CertFile:     "cert.pem",
 		KeyFile:      "key.pem",

agent/cvms/api/grpc/client.go

@@ -11,29 +11,17 @@ import (
 	"github.com/absmach/magistrala/pkg/errors"
 	"github.com/ultravioletrs/cocos/agent"
 	"github.com/ultravioletrs/cocos/agent/cvms"
-	"github.com/ultravioletrs/cocos/agent/cvms/api/grpc/storage"
 	"github.com/ultravioletrs/cocos/agent/cvms/server"
-	pkggrpc "github.com/ultravioletrs/cocos/pkg/clients/grpc"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/protobuf/proto"
 )
 
-const (
-	reconnectInterval = 5 * time.Second
-	sendTimeout       = 5 * time.Second
-	pendingMsgFile    = "pending_messages.json"
-)
-
 var (
 	errCorruptedManifest  = errors.New("received manifest may be corrupted")
 	errUnknonwMessageType = errors.New("unknown message type")
+	sendTimeout           = 5 * time.Second
 )
 
-type PendingMessage struct {
-	Message *cvms.ClientStreamMessage
-	Time    time.Time
-}
-
 type CVMSClient struct {
 	mu            sync.Mutex
 	stream        cvms.Service_ProcessClient
@@ -42,55 +30,21 @@ type CVMSClient struct {
 	logger        *slog.Logger
 	runReqManager *runRequestManager
 	sp            server.AgentServer
-	storage       storage.Storage
-	reconnectFn   func(context.Context) (pkggrpc.Client, cvms.Service_ProcessClient, error)
-	grpcClient    pkggrpc.Client
 }
 
 // NewClient returns new gRPC client instance.
-func NewClient(stream cvms.Service_ProcessClient, svc agent.Service, messageQueue chan *cvms.ClientStreamMessage, logger *slog.Logger, sp server.AgentServer, storageDir string, reconnectFn func(context.Context) (pkggrpc.Client, cvms.Service_ProcessClient, error), grpcClient pkggrpc.Client) (*CVMSClient, error) {
-	store, err := storage.NewFileStorage(storageDir)
-	if err != nil {
-		return nil, err
-	}
-
-	return &CVMSClient{
+func NewClient(stream cvms.Service_ProcessClient, svc agent.Service, messageQueue chan *cvms.ClientStreamMessage, logger *slog.Logger, sp server.AgentServer) CVMSClient {
+	return CVMSClient{
 		stream:        stream,
 		svc:           svc,
 		messageQueue:  messageQueue,
 		logger:        logger,
 		runReqManager: newRunRequestManager(),
 		sp:            sp,
-		storage:       store,
-		reconnectFn:   reconnectFn,
-		grpcClient:    grpcClient,
-	}, nil
-}
-
-func (client *CVMSClient) Process(ctx context.Context, cancel context.CancelFunc) error {
-	for {
-		err := client.processWithRetry(ctx)
-		if ctx.Err() != nil {
-			return ctx.Err()
-		}
-
-		client.logger.Info("Connection lost, attempting to reconnect...", "error", err)
-		time.Sleep(reconnectInterval)
-
-		grpcClient, stream, err := client.reconnectFn(ctx)
-		if err != nil {
-			client.logger.Error("Failed to reconnect", "error", err)
-			continue
-		}
-
-		client.mu.Lock()
-		client.stream = stream
-		client.grpcClient = grpcClient
-		client.mu.Unlock()
 	}
 }
 
-func (client *CVMSClient) processWithRetry(ctx context.Context) error {
+func (client *CVMSClient) Process(ctx context.Context, cancel context.CancelFunc) error {
 	eg, ctx := errgroup.WithContext(ctx)
 
 	eg.Go(func() error {
@@ -121,87 +75,18 @@ func (client *CVMSClient) handleIncomingMessages(ctx context.Context) error {
 	}
 }
 
-func (client *CVMSClient) handleOutgoingMessages(ctx context.Context) error {
-	pendingMsgs, err := client.storage.Load()
-	if err != nil {
-		client.logger.Error("Failed to load pending messages", "error", err)
-	} else {
-		client.sendPendingMessages(pendingMsgs)
-	}
-
-	for {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		case msg := <-client.messageQueue:
-			if err := client.sendStreamMessage(msg); err != nil {
-				if err := client.storage.Add(msg); err != nil {
-					client.logger.Error("Failed to store pending message", "error", err)
-				}
-				client.logger.Error("Failed to send message, stored for retry", "error", err)
-			}
-		}
-	}
-}
-
-func (client *CVMSClient) sendStreamMessage(msg *cvms.ClientStreamMessage) error {
-	client.mu.Lock()
-	defer client.mu.Unlock()
-
-	return client.stream.Send(msg)
-}
-
-func (client *CVMSClient) sendPendingMessages(pending []storage.Message) {
-	for _, pm := range pending {
-		if err := client.sendStreamMessage(pm.Message); err != nil {
-			if err := client.storage.Add(pm.Message); err != nil {
-				client.logger.Error("Failed to store pending message", "error", err)
-			}
-			client.logger.Error("Failed to resend pending message", "error", err)
-		} else {
-			client.logger.Info("Successfully resent pending message")
-		}
-	}
-
-	if err := client.storage.Clear(); err != nil {
-		client.logger.Error("Failed to clear pending messages", "error", err)
-	}
-}
-
 func (client *CVMSClient) processIncomingMessage(ctx context.Context, req *cvms.ServerStreamMessage) error {
 	switch mes := req.Message.(type) {
 	case *cvms.ServerStreamMessage_RunReqChunks:
 		return client.handleRunReqChunks(ctx, mes)
 	case *cvms.ServerStreamMessage_StopComputation:
 		go client.handleStopComputation(ctx, mes)
-	case *cvms.ServerStreamMessage_AgentStateReq:
-		client.handleAgentStateReq(mes)
-	case *cvms.ServerStreamMessage_DisconnectReq:
-		client.logger.Info("Received disconnect request")
-		client.mu.Lock()
-		if err := client.grpcClient.Close(); err != nil {
-			client.logger.Error("Failed to close gRPC client", "error", err)
-		}
-		client.mu.Unlock()
 	default:
 		return errUnknonwMessageType
 	}
 	return nil
 }
 
-func (client *CVMSClient) handleAgentStateReq(mes *cvms.ServerStreamMessage_AgentStateReq) {
-	state := client.svc.State()
-
-	msg := &cvms.ClientStreamMessage_AgentStateRes{
-		AgentStateRes: &cvms.AgentStateRes{
-			State: state,
-			Id:    mes.AgentStateReq.Id,
-		},
-	}
-
-	client.sendMessage(&cvms.ClientStreamMessage{Message: msg})
-}
-
 func (client *CVMSClient) handleRunReqChunks(ctx context.Context, msg *cvms.ServerStreamMessage_RunReqChunks) error {
 	buffer, complete := client.runReqManager.addChunk(msg.RunReqChunks.Id, msg.RunReqChunks.Data, msg.RunReqChunks.IsLast)
 
@@ -262,14 +147,16 @@ func (client *CVMSClient) executeRun(ctx context.Context, runReq *cvms.Computati
 		},
 	}
 
-	if err := client.sp.Start(agent.AgentConfig{
+	err := client.sp.Start(ctx, agent.AgentConfig{
 		Port:         runReq.AgentConfig.Port,
+		Host:         runReq.AgentConfig.Host,
 		CertFile:     runReq.AgentConfig.CertFile,
 		KeyFile:      runReq.AgentConfig.KeyFile,
 		ServerCAFile: runReq.AgentConfig.ServerCaFile,
 		ClientCAFile: runReq.AgentConfig.ClientCaFile,
 		AttestedTls:  runReq.AgentConfig.AttestedTls,
-	}, ac); err != nil {
+	}, ac)
+	if err != nil {
 		client.logger.Warn(err.Error())
 		runRes.RunRes.Error = err.Error()
 	}
@@ -288,14 +175,28 @@ func (client *CVMSClient) handleStopComputation(ctx context.Context, mes *cvms.S
 	}
 
 	client.mu.Lock()
+	defer client.mu.Unlock()
+
 	if err := client.sp.Stop(); err != nil {
 		msg.StopComputationRes.Message = err.Error()
 	}
-	client.mu.Unlock()
 
 	client.sendMessage(&cvms.ClientStreamMessage{Message: msg})
 }
 
+func (client *CVMSClient) handleOutgoingMessages(ctx context.Context) error {
+	for {
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		case mes := <-client.messageQueue:
+			if err := client.stream.Send(mes); err != nil {
+				return err
+			}
+		}
+	}
+}
+
 func (client *CVMSClient) sendMessage(mes *cvms.ClientStreamMessage) {
 	ctx, cancel := context.WithTimeout(context.Background(), sendTimeout)
 	defer cancel()

agent/cvms/api/grpc/client_test.go

@@ -13,8 +13,6 @@ import (
 	"github.com/ultravioletrs/cocos/agent/cvms"
 	servermocks "github.com/ultravioletrs/cocos/agent/cvms/server/mocks"
 	"github.com/ultravioletrs/cocos/agent/mocks"
-	pkggrpc "github.com/ultravioletrs/cocos/pkg/clients/grpc"
-	clientmocks "github.com/ultravioletrs/cocos/pkg/clients/grpc/mocks"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/proto"
 )
@@ -34,16 +32,16 @@ func (m *mockStream) Send(msg *cvms.ClientStreamMessage) error {
 	return args.Error(0)
 }
 
-func TestManagerClient_Process(t *testing.T) {
+func TestManagerClient_Process1(t *testing.T) {
 	tests := []struct {
 		name        string
-		setupMocks  func(mockStream *mockStream, mockSvc *mocks.Service, mockServerSvc *servermocks.AgentServer)
+		setupMocks  func(mockStream *mockStream, mockSvc *mocks.Service, mockServerSvc *servermocks.AgentServerProvider)
 		expectError bool
 		errorMsg    string
 	}{
 		{
 			name: "Stop computation",
-			setupMocks: func(mockStream *mockStream, mockSvc *mocks.Service, mockServerSvc *servermocks.AgentServer) {
+			setupMocks: func(mockStream *mockStream, mockSvc *mocks.Service, mockServerSvc *servermocks.AgentServerProvider) {
 				mockStream.On("Recv").Return(&cvms.ServerStreamMessage{
 					Message: &cvms.ServerStreamMessage_StopComputation{
 						StopComputation: &cvms.StopComputation{},
@@ -58,7 +56,7 @@ func TestManagerClient_Process(t *testing.T) {
 		},
 		{
 			name: "Run request chunks",
-			setupMocks: func(mockStream *mockStream, mockSvc *mocks.Service, mockServerSvc *servermocks.AgentServer) {
+			setupMocks: func(mockStream *mockStream, mockSvc *mocks.Service, mockServerSvc *servermocks.AgentServerProvider) {
 				mockStream.On("Recv").Return(&cvms.ServerStreamMessage{
 					Message: &cvms.ServerStreamMessage_RunReqChunks{
 						RunReqChunks: &cvms.RunReqChunks{},
@@ -71,7 +69,7 @@ func TestManagerClient_Process(t *testing.T) {
 		},
 		{
 			name: "Receive error",
-			setupMocks: func(mockStream *mockStream, mockSvc *mocks.Service, mockServerSvc *servermocks.AgentServer) {
+			setupMocks: func(mockStream *mockStream, mockSvc *mocks.Service, mockServerSvc *servermocks.AgentServerProvider) {
 				mockStream.On("Recv").Return(&cvms.ServerStreamMessage{}, assert.AnError)
 			},
 			expectError: true,
@@ -82,25 +80,18 @@ func TestManagerClient_Process(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			mockStream := new(mockStream)
 			mockSvc := new(mocks.Service)
-			mockServerSvc := new(servermocks.AgentServer)
-			messageQueue := make(chan *cvms.ClientStreamMessage)
+			mockServerSvc := new(servermocks.AgentServerProvider)
+			messageQueue := make(chan *cvms.ClientStreamMessage, 10)
 			logger := mglog.NewMock()
 
-			go func() {
-				<-messageQueue
-			}()
-
-			grpcClient := new(clientmocks.Client)
-
-			client, err := NewClient(mockStream, mockSvc, messageQueue, logger, mockServerSvc, t.TempDir(), func(ctx context.Context) (pkggrpc.Client, cvms.Service_ProcessClient, error) { return nil, nil, nil }, grpcClient)
-			assert.NoError(t, err)
+			client := NewClient(mockStream, mockSvc, messageQueue, logger, mockServerSvc)
 
 			ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
 			defer cancel()
 
 			tc.setupMocks(mockStream, mockSvc, mockServerSvc)
 
-			err = client.Process(ctx, cancel)
+			err := client.Process(ctx, cancel)
 
 			if tc.expectError {
 				assert.Error(t, err)
@@ -117,13 +108,11 @@ func TestManagerClient_Process(t *testing.T) {
 func TestManagerClient_handleRunReqChunks(t *testing.T) {
 	mockStream := new(mockStream)
 	mockSvc := new(mocks.Service)
-	mockServerSvc := new(servermocks.AgentServer)
+	mockServerSvc := new(servermocks.AgentServerProvider)
 	messageQueue := make(chan *cvms.ClientStreamMessage, 10)
 	logger := mglog.NewMock()
-	grpcClient := new(clientmocks.Client)
 
-	client, err := NewClient(mockStream, mockSvc, messageQueue, logger, mockServerSvc, t.TempDir(), func(ctx context.Context) (pkggrpc.Client, cvms.Service_ProcessClient, error) { return nil, nil, nil }, grpcClient)
-	assert.NoError(t, err)
+	client := NewClient(mockStream, mockSvc, messageQueue, logger, mockServerSvc)
 
 	runReq := &cvms.ComputationRunReq{
 		Id: "test-id",
@@ -148,7 +137,7 @@ func TestManagerClient_handleRunReqChunks(t *testing.T) {
 	mockSvc.On("InitComputation", mock.Anything, mock.Anything).Return(nil)
 	mockServerSvc.On("Start", mock.Anything, mock.Anything, mock.Anything).Return(nil)
 
-	err = client.handleRunReqChunks(context.Background(), chunk1)
+	err := client.handleRunReqChunks(context.Background(), chunk1)
 	assert.NoError(t, err)
 
 	err = client.handleRunReqChunks(context.Background(), chunk2)
@@ -169,13 +158,11 @@ func TestManagerClient_handleRunReqChunks(t *testing.T) {
 func TestManagerClient_handleStopComputation(t *testing.T) {
 	mockStream := new(mockStream)
 	mockSvc := new(mocks.Service)
-	mockServerSvc := new(servermocks.AgentServer)
+	mockServerSvc := new(servermocks.AgentServerProvider)
 	messageQueue := make(chan *cvms.ClientStreamMessage, 10)
 	logger := mglog.NewMock()
-	grpcClient := new(clientmocks.Client)
 
-	client, err := NewClient(mockStream, mockSvc, messageQueue, logger, mockServerSvc, t.TempDir(), func(ctx context.Context) (pkggrpc.Client, cvms.Service_ProcessClient, error) { return nil, nil, nil }, grpcClient)
-	assert.NoError(t, err)
+	client := NewClient(mockStream, mockSvc, messageQueue, logger, mockServerSvc)
 
 	stopReq := &cvms.ServerStreamMessage_StopComputation{
 		StopComputation: &cvms.StopComputation{

agent/cvms/api/grpc/storage/mocks/storage.go

@@ -1,234 +0,0 @@
-// Copyright (c) Ultraviolet
-// SPDX-License-Identifier: Apache-2.0
-
-// Code generated by mockery v2.53.3. DO NOT EDIT.
-
-package mocks
-
-import (
-	mock "github.com/stretchr/testify/mock"
-	cvms "github.com/ultravioletrs/cocos/agent/cvms"
-
-	storage "github.com/ultravioletrs/cocos/agent/cvms/api/grpc/storage"
-)
-
-// Storage is an autogenerated mock type for the Storage type
-type Storage struct {
-	mock.Mock
-}
-
-type Storage_Expecter struct {
-	mock *mock.Mock
-}
-
-func (_m *Storage) EXPECT() *Storage_Expecter {
-	return &Storage_Expecter{mock: &_m.Mock}
-}
-
-// Add provides a mock function with given fields: msg
-func (_m *Storage) Add(msg *cvms.ClientStreamMessage) error {
-	ret := _m.Called(msg)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Add")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(*cvms.ClientStreamMessage) error); ok {
-		r0 = rf(msg)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// Storage_Add_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Add'
-type Storage_Add_Call struct {
-	*mock.Call
-}
-
-// Add is a helper method to define mock.On call
-//   - msg *cvms.ClientStreamMessage
-func (_e *Storage_Expecter) Add(msg interface{}) *Storage_Add_Call {
-	return &Storage_Add_Call{Call: _e.mock.On("Add", msg)}
-}
-
-func (_c *Storage_Add_Call) Run(run func(msg *cvms.ClientStreamMessage)) *Storage_Add_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*cvms.ClientStreamMessage))
-	})
-	return _c
-}
-
-func (_c *Storage_Add_Call) Return(_a0 error) *Storage_Add_Call {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *Storage_Add_Call) RunAndReturn(run func(*cvms.ClientStreamMessage) error) *Storage_Add_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Clear provides a mock function with no fields
-func (_m *Storage) Clear() error {
-	ret := _m.Called()
-
-	if len(ret) == 0 {
-		panic("no return value specified for Clear")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func() error); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// Storage_Clear_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Clear'
-type Storage_Clear_Call struct {
-	*mock.Call
-}
-
-// Clear is a helper method to define mock.On call
-func (_e *Storage_Expecter) Clear() *Storage_Clear_Call {
-	return &Storage_Clear_Call{Call: _e.mock.On("Clear")}
-}
-
-func (_c *Storage_Clear_Call) Run(run func()) *Storage_Clear_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *Storage_Clear_Call) Return(_a0 error) *Storage_Clear_Call {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *Storage_Clear_Call) RunAndReturn(run func() error) *Storage_Clear_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Load provides a mock function with no fields
-func (_m *Storage) Load() ([]storage.Message, error) {
-	ret := _m.Called()
-
-	if len(ret) == 0 {
-		panic("no return value specified for Load")
-	}
-
-	var r0 []storage.Message
-	var r1 error
-	if rf, ok := ret.Get(0).(func() ([]storage.Message, error)); ok {
-		return rf()
-	}
-	if rf, ok := ret.Get(0).(func() []storage.Message); ok {
-		r0 = rf()
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]storage.Message)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func() error); ok {
-		r1 = rf()
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// Storage_Load_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Load'
-type Storage_Load_Call struct {
-	*mock.Call
-}
-
-// Load is a helper method to define mock.On call
-func (_e *Storage_Expecter) Load() *Storage_Load_Call {
-	return &Storage_Load_Call{Call: _e.mock.On("Load")}
-}
-
-func (_c *Storage_Load_Call) Run(run func()) *Storage_Load_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *Storage_Load_Call) Return(_a0 []storage.Message, _a1 error) *Storage_Load_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *Storage_Load_Call) RunAndReturn(run func() ([]storage.Message, error)) *Storage_Load_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Save provides a mock function with given fields: messages
-func (_m *Storage) Save(messages []storage.Message) error {
-	ret := _m.Called(messages)
-
-	if len(ret) == 0 {
-		panic("no return value specified for Save")
-	}
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func([]storage.Message) error); ok {
-		r0 = rf(messages)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// Storage_Save_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Save'
-type Storage_Save_Call struct {
-	*mock.Call
-}
-
-// Save is a helper method to define mock.On call
-//   - messages []storage.Message
-func (_e *Storage_Expecter) Save(messages interface{}) *Storage_Save_Call {
-	return &Storage_Save_Call{Call: _e.mock.On("Save", messages)}
-}
-
-func (_c *Storage_Save_Call) Run(run func(messages []storage.Message)) *Storage_Save_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].([]storage.Message))
-	})
-	return _c
-}
-
-func (_c *Storage_Save_Call) Return(_a0 error) *Storage_Save_Call {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *Storage_Save_Call) RunAndReturn(run func([]storage.Message) error) *Storage_Save_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// NewStorage creates a new instance of Storage. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-// The first argument is typically a *testing.T value.
-func NewStorage(t interface {
-	mock.TestingT
-	Cleanup(func())
-}) *Storage {
-	mock := &Storage{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}

agent/cvms/api/grpc/storage/storage.go

@@ -1,111 +0,0 @@
-// Copyright (c) Ultraviolet
-// SPDX-License-Identifier: Apache-2.0
-package storage
-
-import (
-	"encoding/json"
-	"os"
-	"path/filepath"
-	"sync"
-	"time"
-
-	"github.com/ultravioletrs/cocos/agent/cvms"
-)
-
-// Message represents a pending message with its timestamp.
-type Message struct {
-	Message *cvms.ClientStreamMessage
-	Time    time.Time
-}
-
-// Storage defines the interface for message persistence operations.
-type Storage interface {
-	// Load retrieves all pending messages from storage.
-	Load() ([]Message, error)
-
-	// Save persists the given messages to storage.
-	Save(messages []Message) error
-
-	// Add appends a new message to storage.
-	Add(msg *cvms.ClientStreamMessage) error
-
-	// Clear removes all messages from storage.
-	Clear() error
-}
-
-// FileStorage implements Storage interface using file-based persistence.
-type FileStorage struct {
-	mu   sync.Mutex
-	path string
-	msgs []Message
-}
-
-// NewFileStorage creates a new file-based storage instance.
-func NewFileStorage(storageDir string) (*FileStorage, error) {
-	if err := os.MkdirAll(storageDir, 0o755); err != nil {
-		return nil, err
-	}
-
-	return &FileStorage{
-		path: filepath.Join(storageDir, "pending_messages.json"),
-		msgs: make([]Message, 0),
-	}, nil
-}
-
-func (fs *FileStorage) Load() ([]Message, error) {
-	fs.mu.Lock()
-	defer fs.mu.Unlock()
-
-	data, err := os.ReadFile(fs.path)
-	if os.IsNotExist(err) {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	if err := json.Unmarshal(data, &fs.msgs); err != nil {
-		return nil, err
-	}
-
-	return fs.msgs, nil
-}
-
-func (fs *FileStorage) Save(messages []Message) error {
-	fs.mu.Lock()
-	defer fs.mu.Unlock()
-
-	fs.msgs = messages
-
-	data, err := json.Marshal(messages)
-	if err != nil {
-		return err
-	}
-
-	return os.WriteFile(fs.path, data, 0o644)
-}
-
-func (fs *FileStorage) Add(msg *cvms.ClientStreamMessage) error {
-	fs.mu.Lock()
-	defer fs.mu.Unlock()
-
-	fs.msgs = append(fs.msgs, Message{
-		Message: msg,
-		Time:    time.Now(),
-	})
-
-	data, err := json.Marshal(fs.msgs)
-	if err != nil {
-		return err
-	}
-
-	return os.WriteFile(fs.path, data, 0o644)
-}
-
-func (fs *FileStorage) Clear() error {
-	fs.mu.Lock()
-	defer fs.mu.Unlock()
-
-	fs.msgs = make([]Message, 0)
-	return os.WriteFile(fs.path, []byte("[]"), 0o644)
-}

agent/cvms/cvms.proto

@@ -13,15 +13,6 @@ service Service {
   rpc Process(stream ClientStreamMessage) returns (stream ServerStreamMessage) {}
 }
 
-message AgentStateReq {
-  string id = 1;
-}
-
-message AgentStateRes {
-  string id = 1;
-  string state = 2;
-}
-
 message StopComputation {
   string computation_id = 1;
 }
@@ -58,9 +49,6 @@ message ClientStreamMessage {
     AgentEvent agent_event = 2;
     RunResponse run_res = 3;
     StopComputationResponse stopComputationRes = 4;
-    AgentStateRes agentStateRes = 5;
-    AttestationResponse vTPMattestationReport = 6;
-    azureAttestationResponse azureAttestationResult = 7;
   }
 }
 
@@ -69,15 +57,9 @@ message ServerStreamMessage {
     RunReqChunks runReqChunks = 1;
     ComputationRunReq runReq = 2;
     StopComputation stopComputation = 3;
-    AgentStateReq agentStateReq = 4;
-    DisconnectReq disconnectReq = 5;
   }
 }
 
-message DisconnectReq {
-  string id = 1;
-}
-
 message RunReqChunks {
   bytes data = 1;
   string id = 2;
@@ -111,20 +93,11 @@ message Algorithm {
 
 message AgentConfig {
   string port = 1;
-  string cert_file = 2;
-  string key_file = 3;
-  string client_ca_file = 4;
-  string server_ca_file = 5;
-  string log_level = 6;
-  bool   attested_tls = 7;
-}
-
-message AttestationResponse {
-  bytes file = 1;
-  string certSerialNumber = 2;
-}
-
-message azureAttestationResponse {
-  bytes file = 1;
-  string certSerialNumber = 2;
+  string host = 2;
+  string cert_file = 3;
+  string key_file = 4;
+  string client_ca_file = 5;
+  string server_ca_file = 6;
+  string log_level = 7;
+  bool   attested_tls = 8;
 }

agent/cvms/server/cvm.go

@@ -13,6 +13,7 @@ import (
 	"github.com/ultravioletrs/cocos/agent/auth"
 	"github.com/ultravioletrs/cocos/internal/server"
 	grpcserver "github.com/ultravioletrs/cocos/internal/server/grpc"
+	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 )
@@ -23,7 +24,7 @@ const (
 )
 
 type AgentServer interface {
-	Start(cfg agent.AgentConfig, cmp agent.Computation) error
+	Start(ctx context.Context, cfg agent.AgentConfig, cmp agent.Computation) error
 	Stop() error
 }
 
@@ -31,22 +32,16 @@ type agentServer struct {
 	gs     server.Server
 	logger *slog.Logger
 	svc    agent.Service
-	host   string
-	caUrl  string
-	cvmId  string
 }
 
-func NewServer(logger *slog.Logger, svc agent.Service, host string, caUrl string, cvmId string) AgentServer {
+func NewServer(logger *slog.Logger, svc agent.Service) AgentServer {
 	return &agentServer{
 		logger: logger,
 		svc:    svc,
-		host:   host,
-		caUrl:  caUrl,
-		cvmId:  cvmId,
 	}
 }
 
-func (as *agentServer) Start(cfg agent.AgentConfig, cmp agent.Computation) error {
+func (as *agentServer) Start(ctx context.Context, cfg agent.AgentConfig, cmp agent.Computation) error {
 	if cfg.Port == "" {
 		cfg.Port = defSvcGRPCPort
 	}
@@ -54,7 +49,7 @@ func (as *agentServer) Start(cfg agent.AgentConfig, cmp agent.Computation) error
 	agentGrpcServerConfig := server.AgentConfig{
 		ServerConfig: server.ServerConfig{
 			BaseConfig: server.BaseConfig{
-				Host:         as.host,
+				Host:         cfg.Host,
 				Port:         cfg.Port,
 				CertFile:     cfg.CertFile,
 				KeyFile:      cfg.KeyFile,
@@ -76,23 +71,19 @@ func (as *agentServer) Start(cfg agent.AgentConfig, cmp agent.Computation) error
 		return err
 	}
 
-	ctx, cancel := context.WithCancel(context.Background())
+	qp, err := quoteprovider.GetQuoteProvider()
+	if err != nil {
+		as.logger.Error(fmt.Sprintf("failed to create quote provider %s", err.Error()))
+		return err
+	}
 
-	as.gs = grpcserver.New(ctx, cancel, svcName, agentGrpcServerConfig, registerAgentServiceServer, as.logger, authSvc, as.caUrl, as.cvmId)
+	ctx, cancel := context.WithCancel(ctx)
 
-	go func() {
-		err := as.gs.Start()
-		if err != nil {
-			as.logger.Error(fmt.Sprintf("failed to start grpc server %s", err.Error()))
-		}
-	}()
+	as.gs = grpcserver.New(ctx, cancel, svcName, agentGrpcServerConfig, registerAgentServiceServer, as.logger, qp, authSvc)
 
-	return nil
+	return as.gs.Start()
 }
 
 func (as *agentServer) Stop() error {
-	if as.gs == nil {
-		return nil
-	}
 	return as.gs.Stop()
 }

agent/cvms/server/mocks/server.go

@@ -1,39 +1,42 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0
 
-// Code generated by mockery v2.53.3. DO NOT EDIT.
+// Code generated by mockery v2.43.2. DO NOT EDIT.
 
 package mocks
 
 import (
-	mock "github.com/stretchr/testify/mock"
+	context "context"
+
 	agent "github.com/ultravioletrs/cocos/agent"
+
+	mock "github.com/stretchr/testify/mock"
 )
 
-// AgentServer is an autogenerated mock type for the AgentServer type
-type AgentServer struct {
+// AgentServerProvider is an autogenerated mock type for the AgentServerProvider type
+type AgentServerProvider struct {
 	mock.Mock
 }
 
-type AgentServer_Expecter struct {
+type AgentServerProvider_Expecter struct {
 	mock *mock.Mock
 }
 
-func (_m *AgentServer) EXPECT() *AgentServer_Expecter {
-	return &AgentServer_Expecter{mock: &_m.Mock}
+func (_m *AgentServerProvider) EXPECT() *AgentServerProvider_Expecter {
+	return &AgentServerProvider_Expecter{mock: &_m.Mock}
 }
 
-// Start provides a mock function with given fields: cfg, cmp
-func (_m *AgentServer) Start(cfg agent.AgentConfig, cmp agent.Computation) error {
-	ret := _m.Called(cfg, cmp)
+// Start provides a mock function with given fields: ctx, cfg, cmp
+func (_m *AgentServerProvider) Start(ctx context.Context, cfg agent.AgentConfig, cmp agent.Computation) error {
+	ret := _m.Called(ctx, cfg, cmp)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Start")
 	}
 
 	var r0 error
-	if rf, ok := ret.Get(0).(func(agent.AgentConfig, agent.Computation) error); ok {
-		r0 = rf(cfg, cmp)
+	if rf, ok := ret.Get(0).(func(context.Context, agent.AgentConfig, agent.Computation) error); ok {
+		r0 = rf(ctx, cfg, cmp)
 	} else {
 		r0 = ret.Error(0)
 	}
@@ -41,37 +44,38 @@ func (_m *AgentServer) Start(cfg agent.AgentConfig, cmp agent.Computation) error
 	return r0
 }
 
-// AgentServer_Start_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Start'
-type AgentServer_Start_Call struct {
+// AgentServerProvider_Start_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Start'
+type AgentServerProvider_Start_Call struct {
 	*mock.Call
 }
 
 // Start is a helper method to define mock.On call
+//   - ctx context.Context
 //   - cfg agent.AgentConfig
 //   - cmp agent.Computation
-func (_e *AgentServer_Expecter) Start(cfg interface{}, cmp interface{}) *AgentServer_Start_Call {
-	return &AgentServer_Start_Call{Call: _e.mock.On("Start", cfg, cmp)}
+func (_e *AgentServerProvider_Expecter) Start(ctx interface{}, cfg interface{}, cmp interface{}) *AgentServerProvider_Start_Call {
+	return &AgentServerProvider_Start_Call{Call: _e.mock.On("Start", ctx, cfg, cmp)}
 }
 
-func (_c *AgentServer_Start_Call) Run(run func(cfg agent.AgentConfig, cmp agent.Computation)) *AgentServer_Start_Call {
+func (_c *AgentServerProvider_Start_Call) Run(run func(ctx context.Context, cfg agent.AgentConfig, cmp agent.Computation)) *AgentServerProvider_Start_Call {
 	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(agent.AgentConfig), args[1].(agent.Computation))
+		run(args[0].(context.Context), args[1].(agent.AgentConfig), args[2].(agent.Computation))
 	})
 	return _c
 }
 
-func (_c *AgentServer_Start_Call) Return(_a0 error) *AgentServer_Start_Call {
+func (_c *AgentServerProvider_Start_Call) Return(_a0 error) *AgentServerProvider_Start_Call {
 	_c.Call.Return(_a0)
 	return _c
 }
 
-func (_c *AgentServer_Start_Call) RunAndReturn(run func(agent.AgentConfig, agent.Computation) error) *AgentServer_Start_Call {
+func (_c *AgentServerProvider_Start_Call) RunAndReturn(run func(context.Context, agent.AgentConfig, agent.Computation) error) *AgentServerProvider_Start_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
-// Stop provides a mock function with no fields
-func (_m *AgentServer) Stop() error {
+// Stop provides a mock function with given fields:
+func (_m *AgentServerProvider) Stop() error {
 	ret := _m.Called()
 
 	if len(ret) == 0 {
@@ -88,40 +92,40 @@ func (_m *AgentServer) Stop() error {
 	return r0
 }
 
-// AgentServer_Stop_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Stop'
-type AgentServer_Stop_Call struct {
+// AgentServerProvider_Stop_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Stop'
+type AgentServerProvider_Stop_Call struct {
 	*mock.Call
 }
 
 // Stop is a helper method to define mock.On call
-func (_e *AgentServer_Expecter) Stop() *AgentServer_Stop_Call {
-	return &AgentServer_Stop_Call{Call: _e.mock.On("Stop")}
+func (_e *AgentServerProvider_Expecter) Stop() *AgentServerProvider_Stop_Call {
+	return &AgentServerProvider_Stop_Call{Call: _e.mock.On("Stop")}
 }
 
-func (_c *AgentServer_Stop_Call) Run(run func()) *AgentServer_Stop_Call {
+func (_c *AgentServerProvider_Stop_Call) Run(run func()) *AgentServerProvider_Stop_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		run()
 	})
 	return _c
 }
 
-func (_c *AgentServer_Stop_Call) Return(_a0 error) *AgentServer_Stop_Call {
+func (_c *AgentServerProvider_Stop_Call) Return(_a0 error) *AgentServerProvider_Stop_Call {
 	_c.Call.Return(_a0)
 	return _c
 }
 
-func (_c *AgentServer_Stop_Call) RunAndReturn(run func() error) *AgentServer_Stop_Call {
+func (_c *AgentServerProvider_Stop_Call) RunAndReturn(run func() error) *AgentServerProvider_Stop_Call {
 	_c.Call.Return(run)
 	return _c
 }
 
-// NewAgentServer creates a new instance of AgentServer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// NewAgentServerProvider creates a new instance of AgentServerProvider. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewAgentServer(t interface {
+func NewAgentServerProvider(t interface {
 	mock.TestingT
 	Cleanup(func())
-}) *AgentServer {
-	mock := &AgentServer{}
+}) *AgentServerProvider {
+	mock := &AgentServerProvider{}
 	mock.Mock.Test(t)
 
 	t.Cleanup(func() { mock.AssertExpectations(t) })

agent/events/events.pb.go

@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.5
+// 	protoc-gen-go v1.36.0
 // 	protoc        v5.29.0
 // source: agent/events/events.proto
 
@@ -15,7 +15,6 @@ import (
 	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 	reflect "reflect"
 	sync "sync"
-	unsafe "unsafe"
 )
 
 const (
@@ -261,7 +260,7 @@ func (*EventsLogs_AgentEvent) isEventsLogs_Message() {}
 
 var File_agent_events_events_proto protoreflect.FileDescriptor
 
-var file_agent_events_events_proto_rawDesc = string([]byte{
+var file_agent_events_events_proto_rawDesc = []byte{
 	0x0a, 0x19, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x65,
 	0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x65, 0x76, 0x65,
 	0x6e, 0x74, 0x73, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
@@ -300,16 +299,16 @@ var file_agent_events_events_proto_rawDesc = string([]byte{
 	0x67, 0x65, 0x6e, 0x74, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x6d, 0x65, 0x73,
 	0x73, 0x61, 0x67, 0x65, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73,
 	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-})
+}
 
 var (
 	file_agent_events_events_proto_rawDescOnce sync.Once
-	file_agent_events_events_proto_rawDescData []byte
+	file_agent_events_events_proto_rawDescData = file_agent_events_events_proto_rawDesc
 )
 
 func file_agent_events_events_proto_rawDescGZIP() []byte {
 	file_agent_events_events_proto_rawDescOnce.Do(func() {
-		file_agent_events_events_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_agent_events_events_proto_rawDesc), len(file_agent_events_events_proto_rawDesc)))
+		file_agent_events_events_proto_rawDescData = protoimpl.X.CompressGZIP(file_agent_events_events_proto_rawDescData)
 	})
 	return file_agent_events_events_proto_rawDescData
 }
@@ -346,7 +345,7 @@ func file_agent_events_events_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_agent_events_events_proto_rawDesc), len(file_agent_events_events_proto_rawDesc)),
+			RawDescriptor: file_agent_events_events_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   3,
 			NumExtensions: 0,
@@ -357,6 +356,7 @@ func file_agent_events_events_proto_init() {
 		MessageInfos:      file_agent_events_events_proto_msgTypes,
 	}.Build()
 	File_agent_events_events_proto = out.File
+	file_agent_events_events_proto_rawDesc = nil
 	file_agent_events_events_proto_goTypes = nil
 	file_agent_events_events_proto_depIdxs = nil
 }

agent/events/mocks/events.go

@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0
 
-// Code generated by mockery v2.53.3. DO NOT EDIT.
+// Code generated by mockery v2.43.2. DO NOT EDIT.
 
 package mocks
 
@@ -56,7 +56,7 @@ func (_c *Service_SendEvent_Call) Return() *Service_SendEvent_Call {
 }
 
 func (_c *Service_SendEvent_Call) RunAndReturn(run func(string, string, string, json.RawMessage)) *Service_SendEvent_Call {
-	_c.Run(run)
+	_c.Call.Return(run)
 	return _c
 }
 

agent/mocks/agent.go

@@ -1,16 +1,15 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0
 
-// Code generated by mockery v2.53.3. DO NOT EDIT.
+// Code generated by mockery v2.43.2. DO NOT EDIT.
 
 package mocks
 
 import (
-	agent "github.com/ultravioletrs/cocos/agent"
-	attestation "github.com/ultravioletrs/cocos/pkg/attestation"
-
 	context "context"
 
+	agent "github.com/ultravioletrs/cocos/agent"
+
 	mock "github.com/stretchr/testify/mock"
 )
 
@@ -74,9 +73,9 @@ func (_c *Service_Algo_Call) RunAndReturn(run func(context.Context, agent.Algori
 	return _c
 }
 
-// Attestation provides a mock function with given fields: ctx, reportData, nonce, attType
-func (_m *Service) Attestation(ctx context.Context, reportData [64]byte, nonce [32]byte, attType attestation.PlatformType) ([]byte, error) {
-	ret := _m.Called(ctx, reportData, nonce, attType)
+// Attestation provides a mock function with given fields: ctx, reportData
+func (_m *Service) Attestation(ctx context.Context, reportData [64]byte) ([]byte, error) {
+	ret := _m.Called(ctx, reportData)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Attestation")
@@ -84,19 +83,19 @@ func (_m *Service) Attestation(ctx context.Context, reportData [64]byte, nonce [
 
 	var r0 []byte
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, [64]byte, [32]byte, attestation.PlatformType) ([]byte, error)); ok {
-		return rf(ctx, reportData, nonce, attType)
+	if rf, ok := ret.Get(0).(func(context.Context, [64]byte) ([]byte, error)); ok {
+		return rf(ctx, reportData)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, [64]byte, [32]byte, attestation.PlatformType) []byte); ok {
-		r0 = rf(ctx, reportData, nonce, attType)
+	if rf, ok := ret.Get(0).(func(context.Context, [64]byte) []byte); ok {
+		r0 = rf(ctx, reportData)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).([]byte)
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context, [64]byte, [32]byte, attestation.PlatformType) error); ok {
-		r1 = rf(ctx, reportData, nonce, attType)
+	if rf, ok := ret.Get(1).(func(context.Context, [64]byte) error); ok {
+		r1 = rf(ctx, reportData)
 	} else {
 		r1 = ret.Error(1)
 	}
@@ -112,15 +111,13 @@ type Service_Attestation_Call struct {
 // Attestation is a helper method to define mock.On call
 //   - ctx context.Context
 //   - reportData [64]byte
-//   - nonce [32]byte
-//   - attType attestation.PlatformType
-func (_e *Service_Expecter) Attestation(ctx interface{}, reportData interface{}, nonce interface{}, attType interface{}) *Service_Attestation_Call {
-	return &Service_Attestation_Call{Call: _e.mock.On("Attestation", ctx, reportData, nonce, attType)}
+func (_e *Service_Expecter) Attestation(ctx interface{}, reportData interface{}) *Service_Attestation_Call {
+	return &Service_Attestation_Call{Call: _e.mock.On("Attestation", ctx, reportData)}
 }
 
-func (_c *Service_Attestation_Call) Run(run func(ctx context.Context, reportData [64]byte, nonce [32]byte, attType attestation.PlatformType)) *Service_Attestation_Call {
+func (_c *Service_Attestation_Call) Run(run func(ctx context.Context, reportData [64]byte)) *Service_Attestation_Call {
 	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(context.Context), args[1].([64]byte), args[2].([32]byte), args[3].(attestation.PlatformType))
+		run(args[0].(context.Context), args[1].([64]byte))
 	})
 	return _c
 }
@@ -130,67 +127,7 @@ func (_c *Service_Attestation_Call) Return(_a0 []byte, _a1 error) *Service_Attes
 	return _c
 }
 
-func (_c *Service_Attestation_Call) RunAndReturn(run func(context.Context, [64]byte, [32]byte, attestation.PlatformType) ([]byte, error)) *Service_Attestation_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
-// AttestationResult provides a mock function with given fields: ctx, nonce, attType
-func (_m *Service) AttestationResult(ctx context.Context, nonce [32]byte, attType attestation.PlatformType) ([]byte, error) {
-	ret := _m.Called(ctx, nonce, attType)
-
-	if len(ret) == 0 {
-		panic("no return value specified for AttestationResult")
-	}
-
-	var r0 []byte
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, [32]byte, attestation.PlatformType) ([]byte, error)); ok {
-		return rf(ctx, nonce, attType)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, [32]byte, attestation.PlatformType) []byte); ok {
-		r0 = rf(ctx, nonce, attType)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]byte)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, [32]byte, attestation.PlatformType) error); ok {
-		r1 = rf(ctx, nonce, attType)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// Service_AttestationResult_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'AttestationResult'
-type Service_AttestationResult_Call struct {
-	*mock.Call
-}
-
-// AttestationResult is a helper method to define mock.On call
-//   - ctx context.Context
-//   - nonce [32]byte
-//   - attType attestation.PlatformType
-func (_e *Service_Expecter) AttestationResult(ctx interface{}, nonce interface{}, attType interface{}) *Service_AttestationResult_Call {
-	return &Service_AttestationResult_Call{Call: _e.mock.On("AttestationResult", ctx, nonce, attType)}
-}
-
-func (_c *Service_AttestationResult_Call) Run(run func(ctx context.Context, nonce [32]byte, attType attestation.PlatformType)) *Service_AttestationResult_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(context.Context), args[1].([32]byte), args[2].(attestation.PlatformType))
-	})
-	return _c
-}
-
-func (_c *Service_AttestationResult_Call) Return(_a0 []byte, _a1 error) *Service_AttestationResult_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *Service_AttestationResult_Call) RunAndReturn(run func(context.Context, [32]byte, attestation.PlatformType) ([]byte, error)) *Service_AttestationResult_Call {
+func (_c *Service_Attestation_Call) RunAndReturn(run func(context.Context, [64]byte) ([]byte, error)) *Service_Attestation_Call {
 	_c.Call.Return(run)
 	return _c
 }
@@ -242,73 +179,6 @@ func (_c *Service_Data_Call) RunAndReturn(run func(context.Context, agent.Datase
 	return _c
 }
 
-// IMAMeasurements provides a mock function with given fields: ctx
-func (_m *Service) IMAMeasurements(ctx context.Context) ([]byte, []byte, error) {
-	ret := _m.Called(ctx)
-
-	if len(ret) == 0 {
-		panic("no return value specified for IMAMeasurements")
-	}
-
-	var r0 []byte
-	var r1 []byte
-	var r2 error
-	if rf, ok := ret.Get(0).(func(context.Context) ([]byte, []byte, error)); ok {
-		return rf(ctx)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context) []byte); ok {
-		r0 = rf(ctx)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]byte)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context) []byte); ok {
-		r1 = rf(ctx)
-	} else {
-		if ret.Get(1) != nil {
-			r1 = ret.Get(1).([]byte)
-		}
-	}
-
-	if rf, ok := ret.Get(2).(func(context.Context) error); ok {
-		r2 = rf(ctx)
-	} else {
-		r2 = ret.Error(2)
-	}
-
-	return r0, r1, r2
-}
-
-// Service_IMAMeasurements_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'IMAMeasurements'
-type Service_IMAMeasurements_Call struct {
-	*mock.Call
-}
-
-// IMAMeasurements is a helper method to define mock.On call
-//   - ctx context.Context
-func (_e *Service_Expecter) IMAMeasurements(ctx interface{}) *Service_IMAMeasurements_Call {
-	return &Service_IMAMeasurements_Call{Call: _e.mock.On("IMAMeasurements", ctx)}
-}
-
-func (_c *Service_IMAMeasurements_Call) Run(run func(ctx context.Context)) *Service_IMAMeasurements_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(context.Context))
-	})
-	return _c
-}
-
-func (_c *Service_IMAMeasurements_Call) Return(_a0 []byte, _a1 []byte, _a2 error) *Service_IMAMeasurements_Call {
-	_c.Call.Return(_a0, _a1, _a2)
-	return _c
-}
-
-func (_c *Service_IMAMeasurements_Call) RunAndReturn(run func(context.Context) ([]byte, []byte, error)) *Service_IMAMeasurements_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
 // InitComputation provides a mock function with given fields: ctx, cmp
 func (_m *Service) InitComputation(ctx context.Context, cmp agent.Computation) error {
 	ret := _m.Called(ctx, cmp)
@@ -414,51 +284,6 @@ func (_c *Service_Result_Call) RunAndReturn(run func(context.Context) ([]byte, e
 	return _c
 }
 
-// State provides a mock function with no fields
-func (_m *Service) State() string {
-	ret := _m.Called()
-
-	if len(ret) == 0 {
-		panic("no return value specified for State")
-	}
-
-	var r0 string
-	if rf, ok := ret.Get(0).(func() string); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Get(0).(string)
-	}
-
-	return r0
-}
-
-// Service_State_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'State'
-type Service_State_Call struct {
-	*mock.Call
-}
-
-// State is a helper method to define mock.On call
-func (_e *Service_Expecter) State() *Service_State_Call {
-	return &Service_State_Call{Call: _e.mock.On("State")}
-}
-
-func (_c *Service_State_Call) Run(run func()) *Service_State_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *Service_State_Call) Return(_a0 string) *Service_State_Call {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *Service_State_Call) RunAndReturn(run func() string) *Service_State_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
 // StopComputation provides a mock function with given fields: ctx
 func (_m *Service) StopComputation(ctx context.Context) error {
 	ret := _m.Called(ctx)

agent/mocks/agent_grpc_algo.go

@@ -1,8 +1,8 @@
+// Code generated by mockery v2.43.2. DO NOT EDIT.
+
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0
 
-// Code generated by mockery v2.53.3. DO NOT EDIT.
-
 package mocks
 
 import (
@@ -16,20 +16,12 @@ import (
 )
 
 // AgentService_AlgoClient is an autogenerated mock type for the AgentService_AlgoClient type
-type AgentService_AlgoClient[Req interface{}, Res interface{}] struct {
+type AgentService_AlgoClient struct {
 	mock.Mock
 }
 
-type AgentService_AlgoClient_Expecter[Req interface{}, Res interface{}] struct {
-	mock *mock.Mock
-}
-
-func (_m *AgentService_AlgoClient[Req, Res]) EXPECT() *AgentService_AlgoClient_Expecter[Req, Res] {
-	return &AgentService_AlgoClient_Expecter[Req, Res]{mock: &_m.Mock}
-}
-
-// CloseAndRecv provides a mock function with no fields
-func (_m *AgentService_AlgoClient[Req, Res]) CloseAndRecv() (*agent.AlgoResponse, error) {
+// CloseAndRecv provides a mock function with given fields:
+func (_m *AgentService_AlgoClient) CloseAndRecv() (*agent.AlgoResponse, error) {
 	ret := _m.Called()
 
 	if len(ret) == 0 {
@@ -58,35 +50,8 @@ func (_m *AgentService_AlgoClient[Req, Res]) CloseAndRecv() (*agent.AlgoResponse
 	return r0, r1
 }
 
-// AgentService_AlgoClient_CloseAndRecv_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CloseAndRecv'
-type AgentService_AlgoClient_CloseAndRecv_Call[Req interface{}, Res interface{}] struct {
-	*mock.Call
-}
-
-// CloseAndRecv is a helper method to define mock.On call
-func (_e *AgentService_AlgoClient_Expecter[Req, Res]) CloseAndRecv() *AgentService_AlgoClient_CloseAndRecv_Call[Req, Res] {
-	return &AgentService_AlgoClient_CloseAndRecv_Call[Req, Res]{Call: _e.mock.On("CloseAndRecv")}
-}
-
-func (_c *AgentService_AlgoClient_CloseAndRecv_Call[Req, Res]) Run(run func()) *AgentService_AlgoClient_CloseAndRecv_Call[Req, Res] {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *AgentService_AlgoClient_CloseAndRecv_Call[Req, Res]) Return(_a0 *agent.AlgoResponse, _a1 error) *AgentService_AlgoClient_CloseAndRecv_Call[Req, Res] {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *AgentService_AlgoClient_CloseAndRecv_Call[Req, Res]) RunAndReturn(run func() (*agent.AlgoResponse, error)) *AgentService_AlgoClient_CloseAndRecv_Call[Req, Res] {
-	_c.Call.Return(run)
-	return _c
-}
-
-// CloseSend provides a mock function with no fields
-func (_m *AgentService_AlgoClient[Req, Res]) CloseSend() error {
+// CloseSend provides a mock function with given fields:
+func (_m *AgentService_AlgoClient) CloseSend() error {
 	ret := _m.Called()
 
 	if len(ret) == 0 {
@@ -103,35 +68,8 @@ func (_m *AgentService_AlgoClient[Req, Res]) CloseSend() error {
 	return r0
 }
 
-// AgentService_AlgoClient_CloseSend_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CloseSend'
-type AgentService_AlgoClient_CloseSend_Call[Req interface{}, Res interface{}] struct {
-	*mock.Call
-}
-
-// CloseSend is a helper method to define mock.On call
-func (_e *AgentService_AlgoClient_Expecter[Req, Res]) CloseSend() *AgentService_AlgoClient_CloseSend_Call[Req, Res] {
-	return &AgentService_AlgoClient_CloseSend_Call[Req, Res]{Call: _e.mock.On("CloseSend")}
-}
-
-func (_c *AgentService_AlgoClient_CloseSend_Call[Req, Res]) Run(run func()) *AgentService_AlgoClient_CloseSend_Call[Req, Res] {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *AgentService_AlgoClient_CloseSend_Call[Req, Res]) Return(_a0 error) *AgentService_AlgoClient_CloseSend_Call[Req, Res] {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *AgentService_AlgoClient_CloseSend_Call[Req, Res]) RunAndReturn(run func() error) *AgentService_AlgoClient_CloseSend_Call[Req, Res] {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Context provides a mock function with no fields
-func (_m *AgentService_AlgoClient[Req, Res]) Context() context.Context {
+// Context provides a mock function with given fields:
+func (_m *AgentService_AlgoClient) Context() context.Context {
 	ret := _m.Called()
 
 	if len(ret) == 0 {
@@ -150,35 +88,8 @@ func (_m *AgentService_AlgoClient[Req, Res]) Context() context.Context {
 	return r0
 }
 
-// AgentService_AlgoClient_Context_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Context'
-type AgentService_AlgoClient_Context_Call[Req interface{}, Res interface{}] struct {
-	*mock.Call
-}
-
-// Context is a helper method to define mock.On call
-func (_e *AgentService_AlgoClient_Expecter[Req, Res]) Context() *AgentService_AlgoClient_Context_Call[Req, Res] {
-	return &AgentService_AlgoClient_Context_Call[Req, Res]{Call: _e.mock.On("Context")}
-}
-
-func (_c *AgentService_AlgoClient_Context_Call[Req, Res]) Run(run func()) *AgentService_AlgoClient_Context_Call[Req, Res] {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *AgentService_AlgoClient_Context_Call[Req, Res]) Return(_a0 context.Context) *AgentService_AlgoClient_Context_Call[Req, Res] {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *AgentService_AlgoClient_Context_Call[Req, Res]) RunAndReturn(run func() context.Context) *AgentService_AlgoClient_Context_Call[Req, Res] {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Header provides a mock function with no fields
-func (_m *AgentService_AlgoClient[Req, Res]) Header() (metadata.MD, error) {
+// Header provides a mock function with given fields:
+func (_m *AgentService_AlgoClient) Header() (metadata.MD, error) {
 	ret := _m.Called()
 
 	if len(ret) == 0 {
@@ -207,35 +118,8 @@ func (_m *AgentService_AlgoClient[Req, Res]) Header() (metadata.MD, error) {
 	return r0, r1
 }
 
-// AgentService_AlgoClient_Header_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Header'
-type AgentService_AlgoClient_Header_Call[Req interface{}, Res interface{}] struct {
-	*mock.Call
-}
-
-// Header is a helper method to define mock.On call
-func (_e *AgentService_AlgoClient_Expecter[Req, Res]) Header() *AgentService_AlgoClient_Header_Call[Req, Res] {
-	return &AgentService_AlgoClient_Header_Call[Req, Res]{Call: _e.mock.On("Header")}
-}
-
-func (_c *AgentService_AlgoClient_Header_Call[Req, Res]) Run(run func()) *AgentService_AlgoClient_Header_Call[Req, Res] {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *AgentService_AlgoClient_Header_Call[Req, Res]) Return(_a0 metadata.MD, _a1 error) *AgentService_AlgoClient_Header_Call[Req, Res] {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *AgentService_AlgoClient_Header_Call[Req, Res]) RunAndReturn(run func() (metadata.MD, error)) *AgentService_AlgoClient_Header_Call[Req, Res] {
-	_c.Call.Return(run)
-	return _c
-}
-
 // RecvMsg provides a mock function with given fields: m
-func (_m *AgentService_AlgoClient[Req, Res]) RecvMsg(m interface{}) error {
+func (_m *AgentService_AlgoClient) RecvMsg(m interface{}) error {
 	ret := _m.Called(m)
 
 	if len(ret) == 0 {
@@ -252,36 +136,8 @@ func (_m *AgentService_AlgoClient[Req, Res]) RecvMsg(m interface{}) error {
 	return r0
 }
 
-// AgentService_AlgoClient_RecvMsg_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'RecvMsg'
-type AgentService_AlgoClient_RecvMsg_Call[Req interface{}, Res interface{}] struct {
-	*mock.Call
-}
-
-// RecvMsg is a helper method to define mock.On call
-//   - m interface{}
-func (_e *AgentService_AlgoClient_Expecter[Req, Res]) RecvMsg(m interface{}) *AgentService_AlgoClient_RecvMsg_Call[Req, Res] {
-	return &AgentService_AlgoClient_RecvMsg_Call[Req, Res]{Call: _e.mock.On("RecvMsg", m)}
-}
-
-func (_c *AgentService_AlgoClient_RecvMsg_Call[Req, Res]) Run(run func(m interface{})) *AgentService_AlgoClient_RecvMsg_Call[Req, Res] {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(interface{}))
-	})
-	return _c
-}
-
-func (_c *AgentService_AlgoClient_RecvMsg_Call[Req, Res]) Return(_a0 error) *AgentService_AlgoClient_RecvMsg_Call[Req, Res] {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *AgentService_AlgoClient_RecvMsg_Call[Req, Res]) RunAndReturn(run func(interface{}) error) *AgentService_AlgoClient_RecvMsg_Call[Req, Res] {
-	_c.Call.Return(run)
-	return _c
-}
-
 // Send provides a mock function with given fields: _a0
-func (_m *AgentService_AlgoClient[Req, Res]) Send(_a0 *agent.AlgoRequest) error {
+func (_m *AgentService_AlgoClient) Send(_a0 *agent.AlgoRequest) error {
 	ret := _m.Called(_a0)
 
 	if len(ret) == 0 {
@@ -298,36 +154,8 @@ func (_m *AgentService_AlgoClient[Req, Res]) Send(_a0 *agent.AlgoRequest) error
 	return r0
 }
 
-// AgentService_AlgoClient_Send_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Send'
-type AgentService_AlgoClient_Send_Call[Req interface{}, Res interface{}] struct {
-	*mock.Call
-}
-
-// Send is a helper method to define mock.On call
-//   - _a0 *agent.AlgoRequest
-func (_e *AgentService_AlgoClient_Expecter[Req, Res]) Send(_a0 interface{}) *AgentService_AlgoClient_Send_Call[Req, Res] {
-	return &AgentService_AlgoClient_Send_Call[Req, Res]{Call: _e.mock.On("Send", _a0)}
-}
-
-func (_c *AgentService_AlgoClient_Send_Call[Req, Res]) Run(run func(_a0 *agent.AlgoRequest)) *AgentService_AlgoClient_Send_Call[Req, Res] {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*agent.AlgoRequest))
-	})
-	return _c
-}
-
-func (_c *AgentService_AlgoClient_Send_Call[Req, Res]) Return(_a0 error) *AgentService_AlgoClient_Send_Call[Req, Res] {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *AgentService_AlgoClient_Send_Call[Req, Res]) RunAndReturn(run func(*agent.AlgoRequest) error) *AgentService_AlgoClient_Send_Call[Req, Res] {
-	_c.Call.Return(run)
-	return _c
-}
-
 // SendMsg provides a mock function with given fields: m
-func (_m *AgentService_AlgoClient[Req, Res]) SendMsg(m interface{}) error {
+func (_m *AgentService_AlgoClient) SendMsg(m interface{}) error {
 	ret := _m.Called(m)
 
 	if len(ret) == 0 {
@@ -344,36 +172,8 @@ func (_m *AgentService_AlgoClient[Req, Res]) SendMsg(m interface{}) error {
 	return r0
 }
 
-// AgentService_AlgoClient_SendMsg_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SendMsg'
-type AgentService_AlgoClient_SendMsg_Call[Req interface{}, Res interface{}] struct {
-	*mock.Call
-}
-
-// SendMsg is a helper method to define mock.On call
-//   - m interface{}
-func (_e *AgentService_AlgoClient_Expecter[Req, Res]) SendMsg(m interface{}) *AgentService_AlgoClient_SendMsg_Call[Req, Res] {
-	return &AgentService_AlgoClient_SendMsg_Call[Req, Res]{Call: _e.mock.On("SendMsg", m)}
-}
-
-func (_c *AgentService_AlgoClient_SendMsg_Call[Req, Res]) Run(run func(m interface{})) *AgentService_AlgoClient_SendMsg_Call[Req, Res] {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(interface{}))
-	})
-	return _c
-}
-
-func (_c *AgentService_AlgoClient_SendMsg_Call[Req, Res]) Return(_a0 error) *AgentService_AlgoClient_SendMsg_Call[Req, Res] {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *AgentService_AlgoClient_SendMsg_Call[Req, Res]) RunAndReturn(run func(interface{}) error) *AgentService_AlgoClient_SendMsg_Call[Req, Res] {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Trailer provides a mock function with no fields
-func (_m *AgentService_AlgoClient[Req, Res]) Trailer() metadata.MD {
+// Trailer provides a mock function with given fields:
+func (_m *AgentService_AlgoClient) Trailer() metadata.MD {
 	ret := _m.Called()
 
 	if len(ret) == 0 {
@@ -392,40 +192,13 @@ func (_m *AgentService_AlgoClient[Req, Res]) Trailer() metadata.MD {
 	return r0
 }
 
-// AgentService_AlgoClient_Trailer_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Trailer'
-type AgentService_AlgoClient_Trailer_Call[Req interface{}, Res interface{}] struct {
-	*mock.Call
-}
-
-// Trailer is a helper method to define mock.On call
-func (_e *AgentService_AlgoClient_Expecter[Req, Res]) Trailer() *AgentService_AlgoClient_Trailer_Call[Req, Res] {
-	return &AgentService_AlgoClient_Trailer_Call[Req, Res]{Call: _e.mock.On("Trailer")}
-}
-
-func (_c *AgentService_AlgoClient_Trailer_Call[Req, Res]) Run(run func()) *AgentService_AlgoClient_Trailer_Call[Req, Res] {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *AgentService_AlgoClient_Trailer_Call[Req, Res]) Return(_a0 metadata.MD) *AgentService_AlgoClient_Trailer_Call[Req, Res] {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *AgentService_AlgoClient_Trailer_Call[Req, Res]) RunAndReturn(run func() metadata.MD) *AgentService_AlgoClient_Trailer_Call[Req, Res] {
-	_c.Call.Return(run)
-	return _c
-}
-
 // NewAgentService_AlgoClient creates a new instance of AgentService_AlgoClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewAgentService_AlgoClient[Req interface{}, Res interface{}](t interface {
+func NewAgentService_AlgoClient(t interface {
 	mock.TestingT
 	Cleanup(func())
-}) *AgentService_AlgoClient[Req, Res] {
-	mock := &AgentService_AlgoClient[Req, Res]{}
+}) *AgentService_AlgoClient {
+	mock := &AgentService_AlgoClient{}
 	mock.Mock.Test(t)
 
 	t.Cleanup(func() { mock.AssertExpectations(t) })

agent/mocks/agent_grpc_data.go

@@ -1,8 +1,8 @@
+// Code generated by mockery v2.43.2. DO NOT EDIT.
+
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0
 
-// Code generated by mockery v2.53.3. DO NOT EDIT.
-
 package mocks
 
 import (
@@ -16,20 +16,12 @@ import (
 )
 
 // AgentService_DataClient is an autogenerated mock type for the AgentService_DataClient type
-type AgentService_DataClient[Req interface{}, Res interface{}] struct {
+type AgentService_DataClient struct {
 	mock.Mock
 }
 
-type AgentService_DataClient_Expecter[Req interface{}, Res interface{}] struct {
-	mock *mock.Mock
-}
-
-func (_m *AgentService_DataClient[Req, Res]) EXPECT() *AgentService_DataClient_Expecter[Req, Res] {
-	return &AgentService_DataClient_Expecter[Req, Res]{mock: &_m.Mock}
-}
-
-// CloseAndRecv provides a mock function with no fields
-func (_m *AgentService_DataClient[Req, Res]) CloseAndRecv() (*agent.DataResponse, error) {
+// CloseAndRecv provides a mock function with given fields:
+func (_m *AgentService_DataClient) CloseAndRecv() (*agent.DataResponse, error) {
 	ret := _m.Called()
 
 	if len(ret) == 0 {
@@ -58,35 +50,8 @@ func (_m *AgentService_DataClient[Req, Res]) CloseAndRecv() (*agent.DataResponse
 	return r0, r1
 }
 
-// AgentService_DataClient_CloseAndRecv_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CloseAndRecv'
-type AgentService_DataClient_CloseAndRecv_Call[Req interface{}, Res interface{}] struct {
-	*mock.Call
-}
-
-// CloseAndRecv is a helper method to define mock.On call
-func (_e *AgentService_DataClient_Expecter[Req, Res]) CloseAndRecv() *AgentService_DataClient_CloseAndRecv_Call[Req, Res] {
-	return &AgentService_DataClient_CloseAndRecv_Call[Req, Res]{Call: _e.mock.On("CloseAndRecv")}
-}
-
-func (_c *AgentService_DataClient_CloseAndRecv_Call[Req, Res]) Run(run func()) *AgentService_DataClient_CloseAndRecv_Call[Req, Res] {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *AgentService_DataClient_CloseAndRecv_Call[Req, Res]) Return(_a0 *agent.DataResponse, _a1 error) *AgentService_DataClient_CloseAndRecv_Call[Req, Res] {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *AgentService_DataClient_CloseAndRecv_Call[Req, Res]) RunAndReturn(run func() (*agent.DataResponse, error)) *AgentService_DataClient_CloseAndRecv_Call[Req, Res] {
-	_c.Call.Return(run)
-	return _c
-}
-
-// CloseSend provides a mock function with no fields
-func (_m *AgentService_DataClient[Req, Res]) CloseSend() error {
+// CloseSend provides a mock function with given fields:
+func (_m *AgentService_DataClient) CloseSend() error {
 	ret := _m.Called()
 
 	if len(ret) == 0 {
@@ -103,35 +68,8 @@ func (_m *AgentService_DataClient[Req, Res]) CloseSend() error {
 	return r0
 }
 
-// AgentService_DataClient_CloseSend_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CloseSend'
-type AgentService_DataClient_CloseSend_Call[Req interface{}, Res interface{}] struct {
-	*mock.Call
-}
-
-// CloseSend is a helper method to define mock.On call
-func (_e *AgentService_DataClient_Expecter[Req, Res]) CloseSend() *AgentService_DataClient_CloseSend_Call[Req, Res] {
-	return &AgentService_DataClient_CloseSend_Call[Req, Res]{Call: _e.mock.On("CloseSend")}
-}
-
-func (_c *AgentService_DataClient_CloseSend_Call[Req, Res]) Run(run func()) *AgentService_DataClient_CloseSend_Call[Req, Res] {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *AgentService_DataClient_CloseSend_Call[Req, Res]) Return(_a0 error) *AgentService_DataClient_CloseSend_Call[Req, Res] {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *AgentService_DataClient_CloseSend_Call[Req, Res]) RunAndReturn(run func() error) *AgentService_DataClient_CloseSend_Call[Req, Res] {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Context provides a mock function with no fields
-func (_m *AgentService_DataClient[Req, Res]) Context() context.Context {
+// Context provides a mock function with given fields:
+func (_m *AgentService_DataClient) Context() context.Context {
 	ret := _m.Called()
 
 	if len(ret) == 0 {
@@ -150,35 +88,8 @@ func (_m *AgentService_DataClient[Req, Res]) Context() context.Context {
 	return r0
 }
 
-// AgentService_DataClient_Context_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Context'
-type AgentService_DataClient_Context_Call[Req interface{}, Res interface{}] struct {
-	*mock.Call
-}
-
-// Context is a helper method to define mock.On call
-func (_e *AgentService_DataClient_Expecter[Req, Res]) Context() *AgentService_DataClient_Context_Call[Req, Res] {
-	return &AgentService_DataClient_Context_Call[Req, Res]{Call: _e.mock.On("Context")}
-}
-
-func (_c *AgentService_DataClient_Context_Call[Req, Res]) Run(run func()) *AgentService_DataClient_Context_Call[Req, Res] {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *AgentService_DataClient_Context_Call[Req, Res]) Return(_a0 context.Context) *AgentService_DataClient_Context_Call[Req, Res] {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *AgentService_DataClient_Context_Call[Req, Res]) RunAndReturn(run func() context.Context) *AgentService_DataClient_Context_Call[Req, Res] {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Header provides a mock function with no fields
-func (_m *AgentService_DataClient[Req, Res]) Header() (metadata.MD, error) {
+// Header provides a mock function with given fields:
+func (_m *AgentService_DataClient) Header() (metadata.MD, error) {
 	ret := _m.Called()
 
 	if len(ret) == 0 {
@@ -207,35 +118,8 @@ func (_m *AgentService_DataClient[Req, Res]) Header() (metadata.MD, error) {
 	return r0, r1
 }
 
-// AgentService_DataClient_Header_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Header'
-type AgentService_DataClient_Header_Call[Req interface{}, Res interface{}] struct {
-	*mock.Call
-}
-
-// Header is a helper method to define mock.On call
-func (_e *AgentService_DataClient_Expecter[Req, Res]) Header() *AgentService_DataClient_Header_Call[Req, Res] {
-	return &AgentService_DataClient_Header_Call[Req, Res]{Call: _e.mock.On("Header")}
-}
-
-func (_c *AgentService_DataClient_Header_Call[Req, Res]) Run(run func()) *AgentService_DataClient_Header_Call[Req, Res] {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *AgentService_DataClient_Header_Call[Req, Res]) Return(_a0 metadata.MD, _a1 error) *AgentService_DataClient_Header_Call[Req, Res] {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *AgentService_DataClient_Header_Call[Req, Res]) RunAndReturn(run func() (metadata.MD, error)) *AgentService_DataClient_Header_Call[Req, Res] {
-	_c.Call.Return(run)
-	return _c
-}
-
 // RecvMsg provides a mock function with given fields: m
-func (_m *AgentService_DataClient[Req, Res]) RecvMsg(m interface{}) error {
+func (_m *AgentService_DataClient) RecvMsg(m interface{}) error {
 	ret := _m.Called(m)
 
 	if len(ret) == 0 {
@@ -252,36 +136,8 @@ func (_m *AgentService_DataClient[Req, Res]) RecvMsg(m interface{}) error {
 	return r0
 }
 
-// AgentService_DataClient_RecvMsg_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'RecvMsg'
-type AgentService_DataClient_RecvMsg_Call[Req interface{}, Res interface{}] struct {
-	*mock.Call
-}
-
-// RecvMsg is a helper method to define mock.On call
-//   - m interface{}
-func (_e *AgentService_DataClient_Expecter[Req, Res]) RecvMsg(m interface{}) *AgentService_DataClient_RecvMsg_Call[Req, Res] {
-	return &AgentService_DataClient_RecvMsg_Call[Req, Res]{Call: _e.mock.On("RecvMsg", m)}
-}
-
-func (_c *AgentService_DataClient_RecvMsg_Call[Req, Res]) Run(run func(m interface{})) *AgentService_DataClient_RecvMsg_Call[Req, Res] {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(interface{}))
-	})
-	return _c
-}
-
-func (_c *AgentService_DataClient_RecvMsg_Call[Req, Res]) Return(_a0 error) *AgentService_DataClient_RecvMsg_Call[Req, Res] {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *AgentService_DataClient_RecvMsg_Call[Req, Res]) RunAndReturn(run func(interface{}) error) *AgentService_DataClient_RecvMsg_Call[Req, Res] {
-	_c.Call.Return(run)
-	return _c
-}
-
 // Send provides a mock function with given fields: _a0
-func (_m *AgentService_DataClient[Req, Res]) Send(_a0 *agent.DataRequest) error {
+func (_m *AgentService_DataClient) Send(_a0 *agent.DataRequest) error {
 	ret := _m.Called(_a0)
 
 	if len(ret) == 0 {
@@ -298,36 +154,8 @@ func (_m *AgentService_DataClient[Req, Res]) Send(_a0 *agent.DataRequest) error
 	return r0
 }
 
-// AgentService_DataClient_Send_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Send'
-type AgentService_DataClient_Send_Call[Req interface{}, Res interface{}] struct {
-	*mock.Call
-}
-
-// Send is a helper method to define mock.On call
-//   - _a0 *agent.DataRequest
-func (_e *AgentService_DataClient_Expecter[Req, Res]) Send(_a0 interface{}) *AgentService_DataClient_Send_Call[Req, Res] {
-	return &AgentService_DataClient_Send_Call[Req, Res]{Call: _e.mock.On("Send", _a0)}
-}
-
-func (_c *AgentService_DataClient_Send_Call[Req, Res]) Run(run func(_a0 *agent.DataRequest)) *AgentService_DataClient_Send_Call[Req, Res] {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(*agent.DataRequest))
-	})
-	return _c
-}
-
-func (_c *AgentService_DataClient_Send_Call[Req, Res]) Return(_a0 error) *AgentService_DataClient_Send_Call[Req, Res] {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *AgentService_DataClient_Send_Call[Req, Res]) RunAndReturn(run func(*agent.DataRequest) error) *AgentService_DataClient_Send_Call[Req, Res] {
-	_c.Call.Return(run)
-	return _c
-}
-
 // SendMsg provides a mock function with given fields: m
-func (_m *AgentService_DataClient[Req, Res]) SendMsg(m interface{}) error {
+func (_m *AgentService_DataClient) SendMsg(m interface{}) error {
 	ret := _m.Called(m)
 
 	if len(ret) == 0 {
@@ -344,36 +172,8 @@ func (_m *AgentService_DataClient[Req, Res]) SendMsg(m interface{}) error {
 	return r0
 }
 
-// AgentService_DataClient_SendMsg_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SendMsg'
-type AgentService_DataClient_SendMsg_Call[Req interface{}, Res interface{}] struct {
-	*mock.Call
-}
-
-// SendMsg is a helper method to define mock.On call
-//   - m interface{}
-func (_e *AgentService_DataClient_Expecter[Req, Res]) SendMsg(m interface{}) *AgentService_DataClient_SendMsg_Call[Req, Res] {
-	return &AgentService_DataClient_SendMsg_Call[Req, Res]{Call: _e.mock.On("SendMsg", m)}
-}
-
-func (_c *AgentService_DataClient_SendMsg_Call[Req, Res]) Run(run func(m interface{})) *AgentService_DataClient_SendMsg_Call[Req, Res] {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(interface{}))
-	})
-	return _c
-}
-
-func (_c *AgentService_DataClient_SendMsg_Call[Req, Res]) Return(_a0 error) *AgentService_DataClient_SendMsg_Call[Req, Res] {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *AgentService_DataClient_SendMsg_Call[Req, Res]) RunAndReturn(run func(interface{}) error) *AgentService_DataClient_SendMsg_Call[Req, Res] {
-	_c.Call.Return(run)
-	return _c
-}
-
-// Trailer provides a mock function with no fields
-func (_m *AgentService_DataClient[Req, Res]) Trailer() metadata.MD {
+// Trailer provides a mock function with given fields:
+func (_m *AgentService_DataClient) Trailer() metadata.MD {
 	ret := _m.Called()
 
 	if len(ret) == 0 {
@@ -392,40 +192,13 @@ func (_m *AgentService_DataClient[Req, Res]) Trailer() metadata.MD {
 	return r0
 }
 
-// AgentService_DataClient_Trailer_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Trailer'
-type AgentService_DataClient_Trailer_Call[Req interface{}, Res interface{}] struct {
-	*mock.Call
-}
-
-// Trailer is a helper method to define mock.On call
-func (_e *AgentService_DataClient_Expecter[Req, Res]) Trailer() *AgentService_DataClient_Trailer_Call[Req, Res] {
-	return &AgentService_DataClient_Trailer_Call[Req, Res]{Call: _e.mock.On("Trailer")}
-}
-
-func (_c *AgentService_DataClient_Trailer_Call[Req, Res]) Run(run func()) *AgentService_DataClient_Trailer_Call[Req, Res] {
-	_c.Call.Run(func(args mock.Arguments) {
-		run()
-	})
-	return _c
-}
-
-func (_c *AgentService_DataClient_Trailer_Call[Req, Res]) Return(_a0 metadata.MD) *AgentService_DataClient_Trailer_Call[Req, Res] {
-	_c.Call.Return(_a0)
-	return _c
-}
-
-func (_c *AgentService_DataClient_Trailer_Call[Req, Res]) RunAndReturn(run func() metadata.MD) *AgentService_DataClient_Trailer_Call[Req, Res] {
-	_c.Call.Return(run)
-	return _c
-}
-
 // NewAgentService_DataClient creates a new instance of AgentService_DataClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
-func NewAgentService_DataClient[Req interface{}, Res interface{}](t interface {
+func NewAgentService_DataClient(t interface {
 	mock.TestingT
 	Cleanup(func())
-}) *AgentService_DataClient[Req, Res] {
-	mock := &AgentService_DataClient[Req, Res]{}
+}) *AgentService_DataClient {
+	mock := &AgentService_DataClient{}
 	mock.Mock.Test(t)
 
 	t.Cleanup(func() { mock.AssertExpectations(t) })

agent/service.go

@@ -6,6 +6,7 @@ package agent
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"log/slog"
 	"os"
@@ -13,7 +14,7 @@ import (
 	"slices"
 	sync "sync"
 
-	"github.com/absmach/magistrala/pkg/errors"
+	"github.com/google/go-sev-guest/client"
 	"github.com/ultravioletrs/cocos/agent/algorithm"
 	"github.com/ultravioletrs/cocos/agent/algorithm/binary"
 	"github.com/ultravioletrs/cocos/agent/algorithm/docker"
@@ -22,9 +23,6 @@ import (
 	"github.com/ultravioletrs/cocos/agent/events"
 	"github.com/ultravioletrs/cocos/agent/statemachine"
 	"github.com/ultravioletrs/cocos/internal"
-	"github.com/ultravioletrs/cocos/pkg/attestation"
-	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider"
-	"github.com/ultravioletrs/cocos/pkg/attestation/vtpm"
 	"golang.org/x/crypto/sha3"
 )
 
@@ -71,14 +69,11 @@ const (
 )
 
 const (
+	// ReportDataSize is the size of the report data expected by the attestation service.
+	ReportDataSize     = 64
 	algoFilePermission = 0o700
 )
 
-const (
-	ImaMeasurementsFilePath = "/sys/kernel/security/integrity/ima/ascii_runtime_measurements"
-	ImaPcrIndex             = 10
-)
-
 var (
 	// ErrMalformedEntity indicates malformed entity specification (e.g.
 	// invalid username or password).
@@ -104,12 +99,6 @@ var (
 	ErrAllResultsConsumed = errors.New("all results have been consumed by declared consumers")
 	// ErrAttestationFailed attestation failed.
 	ErrAttestationFailed = errors.New("failed to get raw quote")
-	// ErrAttestationVTpmFailed vTPM attestation failed.
-	ErrAttestationVTpmFailed = errors.New("failed to get vTPM quote")
-	// ErrFetchAzureToken azure token fetch failed.
-	ErrFetchAzureToken = errors.New("failed to get azure token")
-	// ErrAttType indicates that the attestation type that is requested does not exist or is not supported.
-	ErrAttestationType = errors.New("attestation type does not exist or is not supported")
 )
 
 // Service specifies an API that must be fullfiled by the domain service
@@ -120,10 +109,7 @@ type Service interface {
 	Algo(ctx context.Context, algorithm Algorithm) error
 	Data(ctx context.Context, dataset Dataset) error
 	Result(ctx context.Context) ([]byte, error)
-	Attestation(ctx context.Context, reportData [quoteprovider.Nonce]byte, nonce [vtpm.Nonce]byte, attType attestation.PlatformType) ([]byte, error)
-	IMAMeasurements(ctx context.Context) ([]byte, []byte, error)
-	AttestationResult(ctx context.Context, nonce [vtpm.Nonce]byte, attType attestation.PlatformType) ([]byte, error)
-	State() string
+	Attestation(ctx context.Context, reportData [ReportDataSize]byte) ([]byte, error)
 }
 
 type agentService struct {
@@ -134,26 +120,24 @@ type agentService struct {
 	sm              statemachine.StateMachine // Manages the state transitions of the agent service.
 	runError        error                     // Stores any error encountered during the computation run.
 	eventSvc        events.Service            // Service for publishing events related to computation.
-	provider        attestation.Provider      // Provider for generating attestation quotes.
+	quoteProvider   client.QuoteProvider      // Provider for generating attestation quotes.
 	logger          *slog.Logger              // Logger for the agent service.
 	resultsConsumed bool                      // Indicates if the results have been consumed.
 	cancel          context.CancelFunc        // Cancels the computation context.
-	vmpl            int                       // VMPL at which the Agent is running.
 }
 
 var _ Service = (*agentService)(nil)
 
 // New instantiates the agent service implementation.
-func New(ctx context.Context, logger *slog.Logger, eventSvc events.Service, provider attestation.Provider, vmlp int) Service {
+func New(ctx context.Context, logger *slog.Logger, eventSvc events.Service, quoteProvider client.QuoteProvider) Service {
 	sm := statemachine.NewStateMachine(Idle)
 	ctx, cancel := context.WithCancel(ctx)
 	svc := &agentService{
-		sm:       sm,
-		eventSvc: eventSvc,
-		provider: provider,
-		logger:   logger,
-		cancel:   cancel,
-		vmpl:     vmlp,
+		sm:            sm,
+		eventSvc:      eventSvc,
+		quoteProvider: quoteProvider,
+		logger:        logger,
+		cancel:        cancel,
 	}
 
 	transitions := []statemachine.Transition{
@@ -188,15 +172,11 @@ func New(ctx context.Context, logger *slog.Logger, eventSvc events.Service, prov
 	return svc
 }
 
-func (as *agentService) State() string {
-	return as.sm.GetState().String()
-}
-
 func (as *agentService) InitComputation(ctx context.Context, cmp Computation) error {
+	defer as.sm.SendEvent(ManifestReceived)
 	if as.sm.GetState() != ReceivingManifest {
 		return ErrStateNotReady
 	}
-	defer as.sm.SendEvent(ManifestReceived)
 
 	as.mu.Lock()
 	defer as.mu.Unlock()
@@ -223,16 +203,14 @@ func (as *agentService) StopComputation(ctx context.Context) error {
 	as.mu.Lock()
 	defer as.mu.Unlock()
 
-	as.eventSvc.SendEvent(as.computation.ID, "Stopped", "Stopped", json.RawMessage{})
-
 	as.cancel()
 
-	if as.algorithm != nil {
-		if err := as.algorithm.Stop(); err != nil {
-			return fmt.Errorf("error stopping computation: %v", err)
-		}
+	if err := as.algorithm.Stop(); err != nil {
+		return fmt.Errorf("error stopping computation: %v", err)
 	}
 
+	sm := statemachine.NewStateMachine(Idle)
+
 	if err := os.RemoveAll(algorithm.DatasetsDir); err != nil {
 		return fmt.Errorf("error removing datasets directory: %v", err)
 	}
@@ -241,24 +219,13 @@ func (as *agentService) StopComputation(ctx context.Context) error {
 		return fmt.Errorf("error removing results directory: %v", err)
 	}
 
-	as.sm.Reset(Idle)
-
+	as.sm = sm
 	as.computation = Computation{}
 	as.algorithm = nil
 	as.result = nil
 	as.runError = nil
 	as.resultsConsumed = false
 
-	ctx, cancel := context.WithCancel(ctx)
-	as.cancel = cancel
-
-	go func() {
-		if err := as.sm.Start(ctx); err != nil {
-			as.logger.Error(err.Error())
-		}
-	}()
-	as.sm.SendEvent(Start)
-
 	return nil
 }
 
@@ -425,42 +392,13 @@ func (as *agentService) Result(ctx context.Context) ([]byte, error) {
 	return as.result, as.runError
 }
 
-func (as *agentService) Attestation(ctx context.Context, reportData [quoteprovider.Nonce]byte, nonce [vtpm.Nonce]byte, attType attestation.PlatformType) ([]byte, error) {
-	switch attType {
-	case attestation.SNP:
-		rawQuote, err := as.provider.TeeAttestation(reportData[:])
-		if err != nil {
-			return []byte{}, errors.Wrap(ErrAttestationFailed, err)
-		}
-		return rawQuote, nil
-	case attestation.VTPM:
-		vTPMQuote, err := as.provider.VTpmAttestation(nonce[:])
-		if err != nil {
-			return []byte{}, errors.Wrap(ErrAttestationVTpmFailed, err)
-		}
-		return vTPMQuote, nil
-	case attestation.SNPvTPM:
-		vTPMQuote, err := as.provider.Attestation(reportData[:], nonce[:])
-		if err != nil {
-			return []byte{}, errors.Wrap(ErrAttestationVTpmFailed, err)
-		}
-		return vTPMQuote, nil
-	default:
-		return []byte{}, ErrAttestationType
+func (as *agentService) Attestation(ctx context.Context, reportData [ReportDataSize]byte) ([]byte, error) {
+	rawQuote, err := as.quoteProvider.GetRawQuote(reportData)
+	if err != nil {
+		return []byte{}, err
 	}
-}
 
-func (as *agentService) AttestationResult(ctx context.Context, nonce [vtpm.Nonce]byte, attType attestation.PlatformType) ([]byte, error) {
-	switch attType {
-	case attestation.AzureToken:
-		token, err := as.provider.AzureAttestationToken(nonce[:])
-		if err != nil {
-			return []byte{}, err
-		}
-		return token, nil
-	default:
-		return []byte{}, ErrAttestationType
-	}
+	return rawQuote, nil
 }
 
 func (as *agentService) runComputation(state statemachine.State) {
@@ -516,17 +454,3 @@ func (as *agentService) publishEvent(status string) statemachine.Action {
 		as.eventSvc.SendEvent(as.computation.ID, state.String(), status, json.RawMessage{})
 	}
 }
-
-func (as *agentService) IMAMeasurements(ctx context.Context) ([]byte, []byte, error) {
-	data, err := os.ReadFile(ImaMeasurementsFilePath)
-	if err != nil {
-		return nil, nil, fmt.Errorf("Error reading Linux IMA measurements file: %s", err.Error())
-	}
-
-	pcr10, err := vtpm.GetPCRSHA1Value(ImaPcrIndex)
-	if err != nil {
-		return nil, nil, fmt.Errorf("Error reading TPM PCR #10: %s", err.Error())
-	}
-
-	return data, pcr10, nil
-}

agent/service_test.go

@@ -20,10 +20,8 @@ import (
 	"github.com/ultravioletrs/cocos/agent/events/mocks"
 	"github.com/ultravioletrs/cocos/agent/statemachine"
 	smmocks "github.com/ultravioletrs/cocos/agent/statemachine/mocks"
-	"github.com/ultravioletrs/cocos/pkg/attestation"
-	mocks2 "github.com/ultravioletrs/cocos/pkg/attestation/mocks"
 	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider"
-	"github.com/ultravioletrs/cocos/pkg/attestation/vtpm"
+	mocks2 "github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider/mocks"
 	"golang.org/x/crypto/sha3"
 	"google.golang.org/grpc/metadata"
 )
@@ -37,6 +35,9 @@ var (
 const datasetFile = "iris.csv"
 
 func TestAlgo(t *testing.T) {
+	qp, err := quoteprovider.GetQuoteProvider()
+	require.NoError(t, err)
+
 	algo, err := os.ReadFile(algoPath)
 	require.NoError(t, err)
 
@@ -119,7 +120,7 @@ func TestAlgo(t *testing.T) {
 
 			ctx, cancel := context.WithCancel(ctx)
 			defer cancel()
-			svc := New(ctx, mglog.NewMock(), events, &attestation.EmptyProvider{}, 0)
+			svc := New(ctx, mglog.NewMock(), events, qp)
 
 			err := svc.InitComputation(ctx, testComputation(t))
 			require.NoError(t, err)
@@ -138,6 +139,9 @@ func TestAlgo(t *testing.T) {
 }
 
 func TestData(t *testing.T) {
+	qp, err := quoteprovider.GetQuoteProvider()
+	require.NoError(t, err)
+
 	algo, err := os.ReadFile(algoPath)
 	require.NoError(t, err)
 
@@ -211,7 +215,7 @@ func TestData(t *testing.T) {
 			ctx, cancel := context.WithCancel(ctx)
 			defer cancel()
 
-			svc := New(ctx, mglog.NewMock(), events, &attestation.EmptyProvider{}, 0)
+			svc := New(ctx, mglog.NewMock(), events, qp)
 
 			err := svc.InitComputation(ctx, testComputation(t))
 			require.NoError(t, err)
@@ -236,6 +240,9 @@ func TestData(t *testing.T) {
 }
 
 func TestResult(t *testing.T) {
+	qp, err := quoteprovider.GetQuoteProvider()
+	require.NoError(t, err)
+
 	cases := []struct {
 		name     string
 		err      error
@@ -293,10 +300,10 @@ func TestResult(t *testing.T) {
 			sm.On("SendEvent", mock.Anything).Return()
 
 			svc := &agentService{
-				sm:          sm,
-				eventSvc:    events,
-				provider:    &attestation.EmptyProvider{},
-				computation: testComputation(t),
+				sm:            sm,
+				eventSvc:      events,
+				quoteProvider: qp,
+				computation:   testComputation(t),
 			}
 
 			go func() {
@@ -316,64 +323,26 @@ func TestResult(t *testing.T) {
 }
 
 func TestAttestation(t *testing.T) {
-	provider := new(mocks2.Provider)
+	qp := new(mocks2.QuoteProvider)
 
 	cases := []struct {
 		name       string
-		reportData [quoteprovider.Nonce]byte
-		nonce      [vtpm.Nonce]byte
+		reportData [ReportDataSize]byte
 		rawQuote   []uint8
-		platform   attestation.PlatformType
 		err        error
 	}{
 		{
-			name:       "Test SNP attestation successful",
+			name:       "Test attestation successful",
 			reportData: generateReportData(),
-			nonce:      [32]byte{},
 			rawQuote:   make([]uint8, 0),
-			platform:   attestation.SNP,
 			err:        nil,
 		},
 		{
-			name:       "Test SNP attestation failed",
+			name:       "Test attestation failed",
 			reportData: generateReportData(),
-			nonce:      [32]byte{},
 			rawQuote:   nil,
-			platform:   attestation.SNP,
 			err:        ErrAttestationFailed,
 		},
-		{
-			name:       "Test vTPM attestation successful",
-			reportData: generateReportData(),
-			nonce:      [32]byte{},
-			rawQuote:   make([]uint8, 0),
-			platform:   attestation.VTPM,
-			err:        nil,
-		},
-		{
-			name:       "Test vTPM attestation failed",
-			reportData: generateReportData(),
-			nonce:      [32]byte{},
-			rawQuote:   nil,
-			platform:   attestation.VTPM,
-			err:        ErrAttestationVTpmFailed,
-		},
-		{
-			name:       "Test SNP-vTPM attestation successful",
-			reportData: generateReportData(),
-			nonce:      [32]byte{},
-			rawQuote:   make([]uint8, 0),
-			platform:   attestation.SNPvTPM,
-			err:        nil,
-		},
-		{
-			name:       "Test SNP-vTPM attestation failed",
-			reportData: generateReportData(),
-			nonce:      [32]byte{},
-			rawQuote:   nil,
-			platform:   attestation.SNPvTPM,
-			err:        ErrAttestationVTpmFailed,
-		},
 	}
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
@@ -386,74 +355,22 @@ func TestAttestation(t *testing.T) {
 			ctx, cancel := context.WithCancel(ctx)
 			defer cancel()
 
-			getQuote := provider.On("TeeAttestation", mock.Anything).Return(tc.rawQuote, tc.err)
-			if tc.err != ErrAttestationFailed && tc.err != ErrAttestationVTpmFailed {
-				getQuote = provider.On("TeeAttestation", mock.Anything).Return(tc.nonce, nil)
+			getQuote := qp.On("GetRawQuote", mock.Anything).Return(tc.rawQuote, tc.err)
+			if tc.err != ErrAttestationFailed {
+				getQuote = qp.On("GetRawQuote", mock.Anything).Return(tc.reportData, nil)
 			}
 			defer getQuote.Unset()
 
-			svc := New(ctx, mglog.NewMock(), events, provider, 0)
+			svc := New(ctx, mglog.NewMock(), events, qp)
 			time.Sleep(300 * time.Millisecond)
-			_, err := svc.Attestation(ctx, tc.reportData, tc.nonce, 0)
+			_, err := svc.Attestation(ctx, tc.reportData)
 			assert.True(t, errors.Contains(err, tc.err), "expected %v, got %v", tc.err, err)
 		})
 	}
 }
 
-func TestAttestationResult(t *testing.T) {
-	provider := new(mocks2.Provider)
-	cases := []struct {
-		name     string
-		nonce    [vtpm.Nonce]byte
-		platform attestation.PlatformType
-		token    []byte
-		err      error
-	}{
-		{
-			name:     "Azure token fetch successful",
-			nonce:    [32]byte{1, 2, 3}, // any test nonce
-			platform: attestation.AzureToken,
-			token:    []byte("mockToken"),
-			err:      nil,
-		},
-		{
-			name:     "Azure token fetch failed",
-			nonce:    [32]byte{4, 5, 6},
-			platform: attestation.AzureToken,
-			token:    []byte{},
-			err:      ErrFetchAzureToken,
-		},
-		{
-			name:     "Invalid attestation type",
-			nonce:    [32]byte{7, 8, 9},
-			platform: attestation.SNP,
-			token:    []byte{},
-			err:      ErrAttestationType,
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			events := new(mocks.Service)
-			events.EXPECT().SendEvent(mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return()
-
-			if tc.platform == attestation.AzureToken {
-				provider.On("AzureAttestationToken", tc.nonce[:]).Return(tc.token, tc.err)
-			}
-
-			ctx := context.Background()
-
-			svc := New(ctx, mglog.NewMock(), events, provider, 0)
-
-			result, err := svc.AttestationResult(ctx, tc.nonce, tc.platform)
-			assert.True(t, errors.Contains(err, tc.err), "expected error %v, got %v", tc.err, err)
-			assert.Equal(t, tc.token, result)
-		})
-	}
-}
-
-func generateReportData() [quoteprovider.Nonce]byte {
-	bytes := make([]byte, quoteprovider.Nonce)
+func generateReportData() [ReportDataSize]byte {
+	bytes := make([]byte, ReportDataSize)
 	_, err := rand.Read(bytes)
 	if err != nil {
 		log.Fatalf("Failed to generate random bytes: %v", err)

agent/statemachine/mocks/state.go

@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0
 
-// Code generated by mockery v2.53.3. DO NOT EDIT.
+// Code generated by mockery v2.43.2. DO NOT EDIT.
 
 package mocks
 
@@ -54,11 +54,11 @@ func (_c *StateMachine_AddTransition_Call) Return() *StateMachine_AddTransition_
 }
 
 func (_c *StateMachine_AddTransition_Call) RunAndReturn(run func(statemachine.Transition)) *StateMachine_AddTransition_Call {
-	_c.Run(run)
+	_c.Call.Return(run)
 	return _c
 }
 
-// GetState provides a mock function with no fields
+// GetState provides a mock function with given fields:
 func (_m *StateMachine) GetState() statemachine.State {
 	ret := _m.Called()
 
@@ -105,39 +105,6 @@ func (_c *StateMachine_GetState_Call) RunAndReturn(run func() statemachine.State
 	return _c
 }
 
-// Reset provides a mock function with given fields: initialState
-func (_m *StateMachine) Reset(initialState statemachine.State) {
-	_m.Called(initialState)
-}
-
-// StateMachine_Reset_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Reset'
-type StateMachine_Reset_Call struct {
-	*mock.Call
-}
-
-// Reset is a helper method to define mock.On call
-//   - initialState statemachine.State
-func (_e *StateMachine_Expecter) Reset(initialState interface{}) *StateMachine_Reset_Call {
-	return &StateMachine_Reset_Call{Call: _e.mock.On("Reset", initialState)}
-}
-
-func (_c *StateMachine_Reset_Call) Run(run func(initialState statemachine.State)) *StateMachine_Reset_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(statemachine.State))
-	})
-	return _c
-}
-
-func (_c *StateMachine_Reset_Call) Return() *StateMachine_Reset_Call {
-	_c.Call.Return()
-	return _c
-}
-
-func (_c *StateMachine_Reset_Call) RunAndReturn(run func(statemachine.State)) *StateMachine_Reset_Call {
-	_c.Run(run)
-	return _c
-}
-
 // SendEvent provides a mock function with given fields: event
 func (_m *StateMachine) SendEvent(event statemachine.Event) {
 	_m.Called(event)
@@ -167,7 +134,7 @@ func (_c *StateMachine_SendEvent_Call) Return() *StateMachine_SendEvent_Call {
 }
 
 func (_c *StateMachine_SendEvent_Call) RunAndReturn(run func(statemachine.Event)) *StateMachine_SendEvent_Call {
-	_c.Run(run)
+	_c.Call.Return(run)
 	return _c
 }
 
@@ -201,7 +168,7 @@ func (_c *StateMachine_SetAction_Call) Return() *StateMachine_SetAction_Call {
 }
 
 func (_c *StateMachine_SetAction_Call) RunAndReturn(run func(statemachine.State, statemachine.Action)) *StateMachine_SetAction_Call {
-	_c.Run(run)
+	_c.Call.Return(run)
 	return _c
 }
 

agent/statemachine/state.go

@@ -30,7 +30,6 @@ type StateMachine interface {
 	GetState() State
 	SendEvent(event Event)
 	Start(ctx context.Context) error
-	Reset(initialState State)
 }
 
 type stateMachine struct {
@@ -90,20 +89,6 @@ func (sm *stateMachine) Start(ctx context.Context) error {
 	}
 }
 
-func (sm *stateMachine) Reset(initialState State) {
-	sm.mu.Lock()
-	defer sm.mu.Unlock()
-
-	// Reset current state to initial state
-	sm.currentState = initialState
-
-	// Close the existing event channel to stop processing events
-	close(sm.eventChan)
-
-	// Create a new event channel
-	sm.eventChan = make(chan Event)
-}
-
 func (sm *stateMachine) handleEvent(event Event) error {
 	sm.mu.Lock()
 	currentState := sm.currentState

attestation.go

@@ -1,6 +1,9 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0
 
+//go:build embed
+// +build embed
+
 package cocosai
 
 import _ "embed"

cli/README.md

@@ -100,22 +100,3 @@ When defining the manifest dataset and algorithm checksums are required. This ca
 ```bash
 ./build/cocos-cli checksum <path_to_dataset_or_algorithm>
 ```
-
-#### Measure IGVM file
-We assume that our current working directory is the root of the cocos repository, both on the host machine and in the VM.
-
-`igvmmeasure` calculates the launch measurement for an IGVM file and can generate a signed version. It ensures integrity by precomputing the expected launch digest, which can be verified against the attestation report. The tool parses IGVM directives, outputs the measurement as a hex string, or creates a signed file for verification at guest launch.
-
-##### Example
-We measure an IGVM file using our measure command, run:
-
-```bash
-./build/cocos-cli igvmmeasure /path/to/igvm/file
-```
-
-The tool will parse the directives in the IGVM file, calculate the launch measurement, and output the computed digest. If successful, it prints the measurement to standard output.
-
-Here is a sample output
-```
-91c4929bec2d0ecf11a708e09f0a57d7d82208bcba2451564444a4b01c22d047995ca27f9053f86de4e8063e9f810548
-```

cli/attestation.go

@@ -3,11 +3,9 @@
 package cli
 
 import (
-	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"io"
 	"os"
 	"strconv"
 	"strings"
@@ -19,45 +17,35 @@ import (
 	"github.com/google/go-sev-guest/proto/check"
 	"github.com/google/go-sev-guest/proto/sevsnp"
 	"github.com/google/go-sev-guest/tools/lib/report"
-	tpmAttest "github.com/google/go-tpm-tools/proto/attest"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/ultravioletrs/cocos/pkg/attestation"
-	"github.com/ultravioletrs/cocos/pkg/attestation/azure"
+	"github.com/ultravioletrs/cocos/agent"
 	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider"
-	"github.com/ultravioletrs/cocos/pkg/attestation/vtpm"
 	"google.golang.org/protobuf/encoding/protojson"
-	"google.golang.org/protobuf/encoding/prototext"
-	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const (
-	defaultMinimumTcb         = 0
-	defaultMinimumLaunchTcb   = 0
-	defaultMinimumGuestSvn    = 0
-	defaultGuestPolicy        = 0x0000000000030000
-	defaultMinimumBuild       = 0
-	defaultCheckCrl           = false
-	defaultTimeout            = 2 * time.Minute
-	defaultMaxRetryDelay      = 30 * time.Second
-	defaultRequireAuthor      = false
-	defaultRequireIdBlock     = false
-	defaultMinVersion         = "0.0"
-	size16                    = 16
-	size32                    = 32
-	size48                    = 48
-	size64                    = 64
-	attestationFilePath       = "attestation.bin"
-	azureAttestResultFilePath = "azure_attest_result.json"
-	azureAttestTokenFilePath  = "azure_attest_token.jwt"
-	vtpmFilePath              = "../quote.dat"
-	attestationReportJson     = "attestation.json"
-	sevProductNameMilan       = "Milan"
-	sevProductNameGenoa       = "Genoa"
-	FormatBinaryPB            = "binarypb"
-	FormatTextProto           = "textproto"
-	exampleJSONConfig         = `
+	defaultMinimumTcb       = 0
+	defaultMinimumLaunchTcb = 0
+	defaultMinimumGuestSvn  = 0
+	defaultGuestPolicy      = 0x0000000000030000
+	defaultMinimumBuild     = 0
+	defaultCheckCrl         = false
+	defaultTimeout          = 2 * time.Minute
+	defaultMaxRetryDelay    = 30 * time.Second
+	defaultRequireAuthor    = false
+	defaultRequireIdBlock   = false
+	defaultMinVersion       = "0.0"
+	size16                  = 16
+	size32                  = 32
+	size48                  = 48
+	size64                  = 64
+	attestationFilePath     = "attestation.bin"
+	attestationJson         = "attestation.json"
+	sevProductNameMilan     = "Milan"
+	sevProductNameGenoa     = "Genoa"
+	exampleJSONConfig       = `
 	{
 		"rootOfTrust":{
 		   "product":"test_product",
@@ -110,48 +98,29 @@ const (
 		}
 	}
 	`
-	SNP        = "snp"
-	VTPM       = "vtpm"
-	SNPvTPM    = "snp-vtpm"
-	AzureToken = "azure-token"
-	CCNone     = "none"
-	CCAzure    = "azure"
-	CCGCP      = "gcp"
 )
 
 var (
-	mode                          string
-	cfg                           = check.Config{Policy: &check.Policy{}, RootOfTrust: &check.RootOfTrust{}}
-	cfgString                     string
-	timeout                       time.Duration
-	maxRetryDelay                 time.Duration
-	platformInfo                  string
-	stepping                      string
-	trustedAuthorKeys             []string
-	trustedAuthorHashes           []string
-	trustedIdKeys                 []string
-	trustedIdKeyHashes            []string
-	attestationFile               string
-	tpmAttestationFile            string
-	attestationRaw                []byte
-	empty16                       = [size16]byte{}
-	empty32                       = [size32]byte{}
-	empty64                       = [size64]byte{}
-	defaultReportIdMa             = []byte{255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255}
-	errReportSize                 = errors.New("attestation contents too small")
-	ErrBadAttestation             = errors.New("attestation file is corrupted or in wrong format")
-	output                        string
-	nonce                         []byte
-	format                        string
-	teeNonce                      []byte
-	tokenNonce                    []byte
-	getTextProtoAttestationReport bool
-	getAzureTokenJWT              bool
-	cloud                         string
+	cfg                 = check.Config{Policy: &check.Policy{}, RootOfTrust: &check.RootOfTrust{}}
+	cfgString           string
+	timeout             time.Duration
+	maxRetryDelay       time.Duration
+	platformInfo        string
+	stepping            string
+	trustedAuthorKeys   []string
+	trustedAuthorHashes []string
+	trustedIdKeys       []string
+	trustedIdKeyHashes  []string
+	attestationFile     string
+	attestation         []byte
+	empty16             = [size16]byte{}
+	empty32             = [size32]byte{}
+	empty64             = [size64]byte{}
+	defaultReportIdMa   = []byte{255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255}
+	getJsonAttestation  bool
+	errReportSize       = errors.New("attestation contents too small")
 )
 
-var errEmptyFile = errors.New("input file is empty")
-
 func (cli *CLI) NewAttestationCmd() *cobra.Command {
 	return &cobra.Command{
 		Use:   "attestation [command]",
@@ -184,96 +153,32 @@ func (cli *CLI) NewAttestationCmd() *cobra.Command {
 
 func (cli *CLI) NewGetAttestationCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:       "get",
-		Short:     "Retrieve attestation information from agent. The argument of the command must be the type of the report (snp or vtpm or snp-vtpm).",
-		ValidArgs: []cobra.Completion{SNP, VTPM, SNPvTPM, AzureToken},
-		Example: fmt.Sprintf(`Based on attestation report type:
-		get %s --tee <512 bit hex value>
-		get %s --vtpm <256 bit hex value>
-		get %s --tee <512 bit hex value> --vtpm <256 bit hex value>
-		get %s --token <256 bit hex value>`, SNP, VTPM, SNPvTPM, AzureToken),
-		Args: cobra.ExactArgs(1),
+		Use:     "get",
+		Short:   "Retrieve attestation information from agent. Report data expected in hex enoded string of length 64 bytes.",
+		Example: "get <report_data>",
+		Args:    cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
 			if cli.connectErr != nil {
 				printError(cmd, "Failed to connect to agent: %v ❌ ", cli.connectErr)
 				return
 			}
 
-			if err := cobra.OnlyValidArgs(cmd, args); err != nil {
-				printError(cmd, "Bad attestation type: %v ❌ ", err)
+			cmd.Println("Getting attestation")
+
+			reportData, err := hex.DecodeString(args[0])
+			if err != nil {
+				printError(cmd, "Error decoding report data: %v ❌ ", err)
 				return
 			}
-
-			attestationType := args[0]
-
-			attType := attestation.SNP
-			switch attestationType {
-			case SNP:
-				cmd.Println("Fetching SEV-SNP attestation report")
-			case VTPM:
-				cmd.Println("Fetching vTPM report")
-				attType = attestation.VTPM
-			case SNPvTPM:
-				cmd.Println("Fetching SEV-SNP and vTPM report")
-				attType = attestation.SNPvTPM
-			case AzureToken:
-				cmd.Println("Fetching Azure token")
-				attType = attestation.AzureToken
-			}
-
-			if (attType == attestation.VTPM || attType == attestation.SNPvTPM) && len(nonce) == 0 {
-				msg := color.New(color.FgRed).Sprint("vTPM nonce must be defined for vTPM attestation ❌ ")
+			if len(reportData) != agent.ReportDataSize {
+				msg := color.New(color.FgRed).Sprintf("report data must be a hex encoded string of length %d bytes ❌ ", agent.ReportDataSize)
 				cmd.Println(msg)
 				return
 			}
 
-			if (attType == attestation.SNP || attType == attestation.SNPvTPM) && len(teeNonce) == 0 {
-				msg := color.New(color.FgRed).Sprint("TEE nonce must be defined for SEV-SNP attestation ❌ ")
-				cmd.Println(msg)
-				return
-			}
-
-			if (attType == attestation.AzureToken) && len(tokenNonce) == 0 {
-				msg := color.New(color.FgRed).Sprint("Token nonce must be defined for Azure attestation ❌ ")
-				cmd.Println(msg)
-				return
-			}
-
-			var fixedReportData [quoteprovider.Nonce]byte
-			if attType == attestation.SNP || attType == attestation.SNPvTPM {
-				if len(teeNonce) > quoteprovider.Nonce {
-					msg := color.New(color.FgRed).Sprintf("nonce must be a hex encoded string of length lesser or equal %d bytes ❌ ", quoteprovider.Nonce)
-					cmd.Println(msg)
-					return
-				}
-
-				copy(fixedReportData[:], teeNonce)
-			}
-
-			var fixedVtpmNonceByte [vtpm.Nonce]byte
-			if attType != attestation.SNP {
-				if (len(nonce) > vtpm.Nonce) || (len(tokenNonce) > vtpm.Nonce) {
-					msg := color.New(color.FgRed).Sprintf("vTPM nonce must be a hex encoded string of length lesser or equal %d bytes ❌ ", vtpm.Nonce)
-					cmd.Println(msg)
-					return
-				}
-				if attType == attestation.AzureToken {
-					copy(fixedVtpmNonceByte[:], tokenNonce)
-				} else {
-					copy(fixedVtpmNonceByte[:], nonce)
-				}
-			}
-
 			filename := attestationFilePath
-
-			if attType == attestation.AzureToken {
-				filename = azureAttestResultFilePath
-			}
-
-			if getTextProtoAttestationReport {
-				filename = attestationReportJson
-			} else if getAzureTokenJWT {
-				filename = azureAttestTokenFilePath
+			if getJsonAttestation {
+				filename = attestationJson
 			}
 
 			attestationFile, err := os.Create(filename)
@@ -282,21 +187,9 @@ func (cli *CLI) NewGetAttestationCmd() *cobra.Command {
 				return
 			}
 
-			var returnJsonAzureToken bool
-
-			if attType == attestation.AzureToken {
-				err := cli.agentSDK.AttestationResult(cmd.Context(), fixedVtpmNonceByte, int(attType), attestationFile)
-				if err != nil {
-					printError(cmd, "Failed to get attestation result due to error: %v ❌", err)
-					return
-				}
-				returnJsonAzureToken = !getAzureTokenJWT
-			} else {
-				err := cli.agentSDK.Attestation(cmd.Context(), fixedReportData, fixedVtpmNonceByte, int(attType), attestationFile)
-				if err != nil {
-					printError(cmd, "Failed to get attestation due to error: %v ❌", err)
-					return
-				}
+			if err := cli.agentSDK.Attestation(cmd.Context(), [agent.ReportDataSize]byte(reportData), attestationFile); err != nil {
+				printError(cmd, "Failed to get attestation due to error: %v ❌ ", err)
+				return
 			}
 
 			if err := attestationFile.Close(); err != nil {
@@ -304,40 +197,17 @@ func (cli *CLI) NewGetAttestationCmd() *cobra.Command {
 				return
 			}
 
-			if getTextProtoAttestationReport || returnJsonAzureToken {
+			if getJsonAttestation {
 				result, err := os.ReadFile(filename)
 				if err != nil {
 					printError(cmd, "Error reading attestation file: %v ❌ ", err)
 					return
 				}
 
-				switch attestationType {
-				case SNP:
-					result, err = attesationToJSON(result)
-					if err != nil {
-						printError(cmd, "Error converting SNP attestation to JSON: %v ❌", err)
-						return
-					}
-
-				case VTPM, SNPvTPM:
-					marshalOptions := prototext.MarshalOptions{
-						Multiline: true,
-						EmitASCII: true,
-					}
-					var attvTPM tpmAttest.Attestation
-					err = proto.Unmarshal(result, &attvTPM)
-					if err != nil {
-						printError(cmd, "Failed to unmarshal the attestation report: %v ❌", err)
-						return
-					}
-					result = []byte(marshalOptions.Format(&attvTPM))
-
-				case AzureToken:
-					result, err = decodeJWTToJSON(result)
-					if err != nil {
-						printError(cmd, "Error decoding Azure token: %v ❌", err)
-						return
-					}
+				result, err = attesationToJSON(result)
+				if err != nil {
+					printError(cmd, "Error converting attestation to json: %v ❌ ", err)
+					return
 				}
 
 				if err := os.WriteFile(filename, result, 0o644); err != nil {
@@ -350,11 +220,7 @@ func (cli *CLI) NewGetAttestationCmd() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().BoolVarP(&getAzureTokenJWT, "azurejwt", "t", false, "Get azure attestation token as jwt format")
-	cmd.Flags().BoolVarP(&getTextProtoAttestationReport, "reporttextproto", "r", false, "Get attestation report in textproto format")
-	cmd.Flags().BytesHexVar(&teeNonce, "tee", []byte{}, "Define the nonce for the SNP attestation report (must be used with attestation type snp and snp-vtpm)")
-	cmd.Flags().BytesHexVar(&nonce, "vtpm", []byte{}, "Define the nonce for the vTPM attestation report (must be used with attestation type vtpm and snp-vtpm)")
-	cmd.Flags().BytesHexVar(&tokenNonce, "token", []byte{}, "Define the nonce for the Azure attestation token (must be used with attestation type azure-token)")
+	cmd.Flags().BoolVarP(&getJsonAttestation, "json", "j", false, "Get attestation in json format")
 
 	return cmd
 }
@@ -386,137 +252,52 @@ func isFileJSON(filename string) bool {
 
 func (cli *CLI) NewValidateAttestationValidationCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "validate",
-		Short: fmt.Sprintf("Validate and verify attestation information. You can define the confidential computing cloud provider (%s, %s, %s; %s is the default) and can choose from 3 modes: %s, %s and %s. Default mode is %s.", CCNone, CCAzure, CCGCP, CCNone, SNP, VTPM, SNPvTPM, SNP),
-		Example: `Based on mode:
-		validate <attestationreportfilepath> --report_data <reportdata> --product <product data> --platform <cc platform> //default
-		validate --mode snp <attestationreportfilepath> --report_data <reportdata> --product <product data>
-		validate --mode vtpm <attestationreportfilepath> --nonce <noncevalue> --format <formatvalue>  --output <outputvalue>
-		validate --mode snp-vtpm <attestationreportfilepath> --report_data <reportdata> --product <product data> --nonce <noncevalue> --format <formatvalue>  --output <outputvalue>
-		validate --cloud none --mode snp <attestationreportfilepath> --report_data <reportdata> --product <product data>
-		validate --cloud azure --mode vtpm <attestationreportfilepath> --nonce <noncevalue> --format <formatvalue>  --output <outputvalue>
-		validate --cloud gcp --mode snp-vtpm <attestationreportfilepath> --report_data <reportdata> --product <product data> --nonce <noncevalue> --format <formatvalue>  --output <outputvalue>`,
-		PreRunE: func(cmd *cobra.Command, args []string) error {
-			mode, _ := cmd.Flags().GetString("mode")
-			if len(args) != 1 {
-				return fmt.Errorf("please pass the attestation report file path")
+		Use:     "validate",
+		Short:   "Validate and verify attestation information. The report is provided as a file path.",
+		Example: "validate <attestation_report_file_path>",
+		Args:    cobra.ExactArgs(1),
+		Run: func(cmd *cobra.Command, args []string) {
+			cmd.Println("Checking attestation")
+
+			attestationFile = string(args[0])
+
+			if err := parseConfig(); err != nil {
+				printError(cmd, "Error parsing config: %v ❌ ", err)
+				return
+			}
+			if err := parseHashes(); err != nil {
+				printError(cmd, "Error parsing hashes: %v ❌ ", err)
+				return
+			}
+			if err := parseFiles(); err != nil {
+				printError(cmd, "Error parsing files: %v ❌ ", err)
+				return
+			}
+			// This format is the attestation report in AMD's specified ABI format, immediately
+			// followed by the certificate table bytes.
+			if len(attestation) < abi.ReportSize {
+				msg := color.New(color.FgRed).Sprintf("attestation contents too small (0x%x bytes). Want at least 0x%x bytes ❌ ", len(attestation), abi.ReportSize)
+				cmd.Println(msg)
+				return
+			}
+			if err := parseUints(); err != nil {
+				printError(cmd, "Error parsing uints: %v ❌ ", err)
+				return
+			}
+			cfg.Policy.Vmpl = wrapperspb.UInt32(0)
+
+			if err := validateInput(); err != nil {
+				printError(cmd, "Error validating input: %v ❌ ", err)
+				return
 			}
 
-			// Validate flags based on the mode
-			switch mode {
-			case SNP:
-				if err := cmd.MarkFlagRequired("report_data"); err != nil {
-					return fmt.Errorf("failed to mark 'report_data' as required for SEV-%s mode: %v", SNP, err)
-				}
-				if err := cmd.MarkFlagRequired("product"); err != nil {
-					return fmt.Errorf("failed to mark flag as required: %v ❌ ", err)
-				}
-			case SNPvTPM:
-				if err := cmd.MarkFlagRequired("nonce"); err != nil {
-					return fmt.Errorf("failed to mark 'nonce' as required for %s mode: %v", VTPM, err)
-				}
-				if err := cmd.MarkFlagRequired("report_data"); err != nil {
-					return fmt.Errorf("failed to mark 'report_data' as required for SEV-%s mode: %v", SNP, err)
-				}
-				if err := cmd.MarkFlagRequired("product"); err != nil {
-					return fmt.Errorf("failed to mark flag as required: %v ❌ ", err)
-				}
-				if err := cmd.MarkFlagRequired("format"); err != nil {
-					return fmt.Errorf("failed to mark 'format' as required for %s mode: %v", VTPM, err)
-				}
-				if err := cmd.MarkFlagRequired("output"); err != nil {
-					return fmt.Errorf("failed to mark 'output' as required for %s mode: %v", VTPM, err)
-				}
-			case VTPM:
-				if err := cmd.MarkFlagRequired("nonce"); err != nil {
-					return fmt.Errorf("failed to mark 'nonce' as required for %s mode: %v", VTPM, err)
-				}
-				if err := cmd.MarkFlagRequired("format"); err != nil {
-					return fmt.Errorf("failed to mark 'format' as required for %s mode: %v", VTPM, err)
-				}
-				if err := cmd.MarkFlagRequired("output"); err != nil {
-					return fmt.Errorf("failed to mark 'output' as required for %s mode: %v", VTPM, err)
-				}
-			default:
-				return fmt.Errorf("unknown mode: %s", mode)
+			if err := quoteprovider.VerifyAndValidate(attestation, &cfg); err != nil {
+				printError(cmd, "Attestation validation and verification failed with error: %v ❌ ", err)
+				return
 			}
-			return nil
+			cmd.Println("Attestation validation and verification is successful!")
 		},
-		RunE: func(cmd *cobra.Command, args []string) error {
-			mode, _ := cmd.Flags().GetString("mode")
-			cloud, _ := cmd.Flags().GetString("cloud")
-
-			output, err := createOutputFile()
-			if err != nil {
-				return fmt.Errorf("failed to create output file: %v ❌ ", err)
-			}
-			if closer, ok := output.(*os.File); ok {
-				defer closer.Close()
-			}
-
-			var provider attestation.Provider
-			switch cloud {
-			case CCNone:
-				provider = vtpm.New(nil, false, 0, output)
-			case CCAzure:
-				provider = azure.New(output)
-			case CCGCP:
-				provider = vtpm.New(nil, false, 0, output)
-			default:
-				provider = vtpm.New(nil, false, 0, output)
-			}
-
-			switch mode {
-			case SNP:
-				return sevsnpverify(cmd, provider, args)
-			case SNPvTPM:
-				return vtpmSevSnpverify(args, provider)
-			case VTPM:
-				return vtpmverify(args, provider)
-			default:
-				return fmt.Errorf("unknown mode: %s", mode)
-			}
-		},
-		SilenceUsage:  true,
-		SilenceErrors: true,
 	}
-	cmd.Flags().StringVar(
-		&cloud,
-		"cloud",
-		"none", // default CC provider
-		"The confidential computing cloud provider. Example: azure",
-	)
-
-	cmd.Flags().StringVar(
-		&mode,
-		"mode",
-		"snp", // default mode
-		"The attestation validation mode. Example: snp",
-	)
-
-	// VTPM FLAGS
-	cmd.Flags().BytesHexVar(
-		&nonce,
-		"nonce",
-		[]byte{},
-		"hex encoded nonce for vTPM attestation, cannot be empty",
-	)
-
-	cmd.Flags().StringVar(
-		&format,
-		"format",
-		"binarypb", // default value
-		"type of output file where attestation report stored <binarypb|textproto>",
-	)
-
-	cmd.Flags().StringVar(
-		&output,
-		"output",
-		"",
-		"output file",
-	)
-
-	// SEV-SNP FLAGS
 	cmd.Flags().StringVar(
 		&cfgString,
 		"config",
@@ -692,180 +473,19 @@ func (cli *CLI) NewValidateAttestationValidationCmd() *cobra.Command {
 		"PEM format CA bundles for the AMD product. Combined with contents of cabundle_paths.",
 	)
 
+	if err := cmd.MarkFlagRequired("report_data"); err != nil {
+		printError(cmd, "Failed to mark flag as required: %v ❌ ", err)
+		return nil
+	}
+
+	if err := cmd.MarkFlagRequired("product"); err != nil {
+		printError(cmd, "Failed to mark flag as required: %v ❌ ", err)
+		return nil
+	}
+
 	return cmd
 }
 
-func (cli *CLI) NewMeasureCmd(igvmBinaryPath string) *cobra.Command {
-	igvmmeasureCmd := &cobra.Command{
-		Use:   "igvmmeasure <INPUT>",
-		Short: "Measure an IGVM file",
-		Long: `igvmmeasure measures an IGVM file and outputs the calculated measurement.
-			It ensures integrity verification for the IGVM file.`,
-
-		Args: cobra.MinimumNArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 0 {
-				return fmt.Errorf("error: No input file provided")
-			}
-
-			inputFile := args[0]
-
-			measurement, err := cli.measurement.Run(inputFile)
-			if err != nil {
-				return err
-			}
-
-			outputString := string(measurement)
-			lines := strings.Split(strings.TrimSpace(outputString), "\n")
-
-			if len(lines) == 1 {
-				outputString = strings.ToLower(outputString)
-			} else {
-				return fmt.Errorf("error: %s", outputString)
-			}
-
-			cmd.Print(outputString)
-
-			return nil
-		},
-	}
-
-	return igvmmeasureCmd
-}
-
-func sevsnpverify(cmd *cobra.Command, provider attestation.Provider, args []string) error {
-	cmd.Println("Checking attestation")
-
-	attestationFile = string(args[0])
-	if err := parseAttestationFile(); err != nil {
-		return fmt.Errorf("error parsing config: %v ❌ ", err)
-	}
-
-	// This format is the attestation report in AMD's specified ABI format, immediately
-	// followed by the certificate table bytes.
-	if len(attestationRaw) < abi.ReportSize {
-		return fmt.Errorf("attestation too small: got 0x%x bytes, need at least 0x%x bytes", len(attestationRaw), abi.ReportSize)
-	}
-
-	if err := parseAttestationConfig(); err != nil {
-		return err
-	}
-
-	// Used for verification of SNP attestation report
-	attestation.AttestationPolicy.Config = &cfg
-
-	if err := provider.VerifTeeAttestation(attestationRaw, cfg.Policy.ReportData); err != nil {
-		return fmt.Errorf("attestation validation and verification failed with error: %v ❌ ", err)
-	}
-
-	cmd.Println("Attestation validation and verification is successful!")
-	return nil
-}
-
-func parseAttestationConfig() error {
-	if err := parseConfig(); err != nil {
-		return fmt.Errorf("error parsing config: %v ❌ ", err)
-	}
-	if err := parseHashes(); err != nil {
-		return fmt.Errorf("error parsing hashes: %v ❌ ", err)
-	}
-	if err := parseTrustedKeys(); err != nil {
-		return fmt.Errorf("error parsing files: %v ❌ ", err)
-	}
-
-	if err := parseUints(); err != nil {
-		return fmt.Errorf("error parsing uints: %v ❌ ", err)
-	}
-
-	if err := validateInput(); err != nil {
-		return fmt.Errorf("error validating input: %v ❌ ", err)
-	}
-
-	return nil
-}
-
-func vtpmSevSnpverify(args []string, provider attestation.Provider) error {
-	attest, err := returnvTPMAttestation(args)
-	if err != nil {
-		return err
-	}
-
-	if err := parseAttestationConfig(); err != nil {
-		return err
-	}
-
-	// Used for verification of SNP attestation report
-	attestation.AttestationPolicy.Config = &cfg
-
-	if err := provider.VerifyAttestation(attest, cfg.Policy.ReportData, nonce); err != nil {
-		return fmt.Errorf("attestation validation and verification failed with error: %v ❌ ", err)
-	}
-
-	return nil
-}
-
-func vtpmverify(args []string, provider attestation.Provider) error {
-	attestation, err := returnvTPMAttestation(args)
-	if err != nil {
-		return err
-	}
-
-	if err := provider.VerifVTpmAttestation(attestation, nonce); err != nil {
-		return fmt.Errorf("attestation validation and verification failed with error: %v ❌ ", err)
-	}
-
-	return nil
-}
-
-func returnvTPMAttestation(args []string) ([]byte, error) {
-	tpmAttestationFile = string(args[0])
-	input, err := openInputFile()
-	if err != nil {
-		return nil, err
-	}
-	if closer, ok := input.(*os.File); ok {
-		defer closer.Close()
-	}
-	attestationBytes, err := io.ReadAll(input)
-	if err != nil {
-		return nil, err
-	}
-	attestation := &tpmAttest.Attestation{}
-
-	if format == FormatBinaryPB {
-		return attestationBytes, nil
-	} else if format == FormatTextProto {
-		unmarshalOptions := prototext.UnmarshalOptions{}
-		err = unmarshalOptions.Unmarshal(attestationBytes, attestation)
-	} else {
-		return nil, fmt.Errorf("format should be either binarypb or textproto")
-	}
-	if err != nil {
-		return nil, fmt.Errorf("fail to unmarshal attestation report: %v", err)
-	}
-
-	attestationBytes, err = proto.Marshal(attestation)
-	if err != nil {
-		return nil, fmt.Errorf("fail to marshal vTPM attestation report: %v", err)
-	}
-
-	return attestationBytes, nil
-}
-
-func openInputFile() (io.Reader, error) {
-	if tpmAttestationFile == "" {
-		return nil, errEmptyFile
-	}
-	return os.Open(tpmAttestationFile)
-}
-
-func createOutputFile() (io.Writer, error) {
-	if output == "" {
-		return os.Stdout, nil
-	}
-	return os.Create(output)
-}
-
 // parseConfig decodes config passed as json for check.Config struct.
 // example
 /* {
@@ -954,23 +574,19 @@ func parseHashes() error {
 	return nil
 }
 
-func parseAttestationFile() error {
+func parseFiles() error {
 	file, err := os.ReadFile(attestationFile)
 	if err != nil {
 		return err
 	}
-	attestationRaw = file
+	attestation = file
 	if isFileJSON(attestationFile) {
-		attestationRaw, err = attesationFromJSON(attestationRaw)
+		attestation, err = attesationFromJSON(attestation)
 		if err != nil {
 			return err
 		}
 	}
 
-	return nil
-}
-
-func parseTrustedKeys() error {
 	for _, path := range trustedAuthorKeys {
 		file, err := os.ReadFile(path)
 		if err != nil {
@@ -1083,47 +699,3 @@ func validateFieldLength(fieldName string, field []byte, expectedLength int) err
 	}
 	return nil
 }
-
-func decodeJWTToJSON(tokenBytes []byte) ([]byte, error) {
-	token := string(tokenBytes) // convert to string
-	parts := strings.Split(token, ".")
-	if len(parts) < 2 {
-		return nil, fmt.Errorf("invalid JWT: must have at least 2 parts")
-	}
-
-	decode := func(seg string) (map[string]interface{}, error) {
-		// Add padding if missing
-		if m := len(seg) % 4; m != 0 {
-			seg += strings.Repeat("=", 4-m)
-		}
-
-		data, err := base64.URLEncoding.DecodeString(seg)
-		if err != nil {
-			return nil, err
-		}
-
-		var result map[string]interface{}
-		if err := json.Unmarshal(data, &result); err != nil {
-			return nil, err
-		}
-
-		return result, nil
-	}
-
-	header, err := decode(parts[0])
-	if err != nil {
-		return nil, fmt.Errorf("failed to decode header: %v", err)
-	}
-
-	payload, err := decode(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("failed to decode payload: %v", err)
-	}
-
-	combined := map[string]interface{}{
-		"header":  header,
-		"payload": payload,
-	}
-
-	return json.MarshalIndent(combined, "", "  ")
-}

cli/attestation_policy.go

@@ -3,23 +3,15 @@
 package cli
 
 import (
-	"bytes"
-	"crypto/sha512"
 	"encoding/base64"
-	"encoding/json"
 	"fmt"
 	"os"
-	"strconv"
 
 	"github.com/absmach/magistrala/pkg/errors"
 	"github.com/google/go-sev-guest/proto/check"
-	"github.com/google/go-tpm-tools/proto/attest"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/ultravioletrs/cocos/pkg/attestation"
-	"github.com/ultravioletrs/cocos/pkg/attestation/azure"
-	"github.com/ultravioletrs/cocos/pkg/attestation/gcp"
-	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/encoding/protojson"
 )
 
 type fieldType int
@@ -38,14 +30,13 @@ const (
 )
 
 var (
-	errDecode                              = errors.New("base64 string could not be decoded")
-	errDataLength                          = errors.New("data does not have an adequate length")
-	errReadingAttestationPolicyFile        = errors.New("error while reading the attestation policy file")
-	errUnmarshalJSON                       = errors.New("failed to unmarshal json")
-	errMarshalJSON                         = errors.New("failed to marshal json")
-	errWriteFile                           = errors.New("failed to write to file")
-	errAttestationPolicyField              = errors.New("the specified field type does not exist in the attestation policy")
-	policy                          uint64 = 196639
+	errDecode                       = errors.New("base64 string could not be decoded")
+	errDataLength                   = errors.New("data does not have an adequate length")
+	errReadingAttestationPolicyFile = errors.New("error while reading the attestation policy file")
+	errUnmarshalJSON                = errors.New("failed to unmarshal json")
+	errMarshalJSON                  = errors.New("failed to marshal json")
+	errWriteFile                    = errors.New("failed to write to file")
+	errAttestationPolicyField       = errors.New("the specified field type does not exist in the attestation policy")
 )
 
 func (cli *CLI) NewAttestationPolicyCmd() *cobra.Command {
@@ -108,172 +99,6 @@ func (cli *CLI) NewAddHostDataCmd() *cobra.Command {
 	}
 }
 
-func (cli *CLI) NewGCPAttestationPolicy() *cobra.Command {
-	return &cobra.Command{
-		Use:     "gcp",
-		Short:   "Get attestation policy for GCP CVM",
-		Example: `gcp <bin_vtmp_attestation_report_file> <vcpu_count>`,
-		Args:    cobra.ExactArgs(2),
-		Run: func(cmd *cobra.Command, args []string) {
-			attestationBin, err := os.ReadFile(args[0])
-			if err != nil {
-				printError(cmd, "Error reading attestation report file: %v ❌ ", err)
-				return
-			}
-
-			vcpuCount, err := strconv.Atoi(args[1])
-			if err != nil {
-				printError(cmd, "Error converting vCPU count to integer: %v ❌ ", err)
-				return
-			}
-
-			attestation := &attest.Attestation{}
-
-			if err := proto.Unmarshal(attestationBin, attestation); err != nil {
-				printError(cmd, "Error unmarshaling attestation report: %v ❌ ", err)
-				return
-			}
-
-			attestationPB := attestation.GetSevSnpAttestation()
-
-			measurement, err := gcp.Extract384BitMeasurement(attestationPB)
-			if err != nil {
-				printError(cmd, "Error extracting 384-bit measurement: %v ❌ ", err)
-				return
-			}
-
-			launchEndorsement, err := gcp.GetLaunchEndorsement(cmd.Context(), measurement)
-			if err != nil {
-				printError(cmd, "Error getting launch endorsement: %v ❌ ", err)
-				return
-			}
-
-			attestationPolicy, err := gcp.GenerateAttestationPolicy(launchEndorsement, uint32(vcpuCount))
-			if err != nil {
-				printError(cmd, "Error generating attestation policy: %v ❌ ", err)
-				return
-			}
-
-			attestationPolicyJson, err := json.MarshalIndent(attestationPolicy, "", "  ")
-			if err != nil {
-				printError(cmd, "Error marshaling attestation policy: %v ❌ ", err)
-				return
-			}
-
-			if err := os.WriteFile("attestation_policy.json", attestationPolicyJson, filePermission); err != nil {
-				printError(cmd, "Error writing attestation policy file: %v ❌ ", err)
-				return
-			}
-
-			cmd.Println("Attestation policy file generated successfully ✅")
-		},
-	}
-}
-
-func (cli *CLI) NewDownloadGCPOvmfFile() *cobra.Command {
-	return &cobra.Command{
-		Use:     "download",
-		Short:   "Download GCP OVMF file",
-		Example: `download <bin_vtmp_attestation_report_file>`,
-		Args:    cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			attestationBin, err := os.ReadFile(args[0])
-			if err != nil {
-				printError(cmd, "Error reading attestation report file: %v ❌ ", err)
-				return
-			}
-
-			attestation := &attest.Attestation{}
-
-			if err := proto.Unmarshal(attestationBin, attestation); err != nil {
-				printError(cmd, "Error unmarshaling attestation report: %v ❌ ", err)
-				return
-			}
-
-			attestationPB := attestation.GetSevSnpAttestation()
-
-			measurement, err := gcp.Extract384BitMeasurement(attestationPB)
-			if err != nil {
-				printError(cmd, "Error extracting 384-bit measurement: %v ❌ ", err)
-				return
-			}
-
-			launchEndorsement, err := gcp.GetLaunchEndorsement(cmd.Context(), measurement)
-			if err != nil {
-				printError(cmd, "Error getting launch endorsement: %v ❌ ", err)
-				return
-			}
-
-			ovmf, err := gcp.DownloadOvmfFile(cmd.Context(), fmt.Sprintf("%x", launchEndorsement.Digest))
-			if err != nil {
-				printError(cmd, "Error downloading OVMF file: %v ❌ ", err)
-				return
-			}
-
-			sum384 := sha512.Sum384(ovmf)
-
-			if !bytes.Equal(sum384[:], launchEndorsement.Digest) {
-				printError(cmd, "Error OVMF file does not match the measurement: %v ❌ ", fmt.Errorf("digest mismatch"))
-			} else {
-				cmd.Println("OVMF firmware in vm is unmodified ✅")
-			}
-
-			if err := os.WriteFile("ovmf.fd", ovmf, filePermission); err != nil {
-				printError(cmd, "Error writing OVMF file: %v ❌ ", err)
-				return
-			}
-
-			cmd.Println("OVMF file downloaded successfully ✅")
-		},
-	}
-}
-
-func (cli *CLI) NewAzureAttestationPolicy() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:     "azure",
-		Short:   "Get attestation policy for Azure CVM",
-		Example: `azure <azure_maa_token_file> <product_name>`,
-		Args:    cobra.ExactArgs(2),
-		Run: func(cmd *cobra.Command, args []string) {
-			token, err := os.ReadFile(args[0])
-			if err != nil {
-				printError(cmd, "Error reading attestation report file: %v ❌ ", err)
-				return
-			}
-
-			product := args[1]
-
-			config, err := azure.GenerateAttestationPolicy(string(token), product, policy)
-			if err != nil {
-				printError(cmd, "Error generating attestation policy: %v ❌ ", err)
-				return
-			}
-
-			attestationPolicyJson, err := json.MarshalIndent(&config, "", " ")
-			if err != nil {
-				printError(cmd, "Error marshaling attestation policy: %v ❌ ", err)
-				return
-			}
-
-			if err := os.WriteFile("attestation_policy.json", attestationPolicyJson, filePermission); err != nil {
-				printError(cmd, "Error writing attestation policy file: %v ❌ ", err)
-				return
-			}
-
-			cmd.Println("Attestation policy file generated successfully ✅")
-		},
-	}
-
-	cmd.Flags().Uint64Var(
-		&policy,
-		"policy",
-		policy,
-		"Policy of the guest CVM",
-	)
-
-	return cmd
-}
-
 func changeAttestationConfiguration(fileName, base64Data string, expectedLength int, field fieldType) error {
 	data, err := base64.StdEncoding.DecodeString(base64Data)
 	if err != nil {
@@ -284,31 +109,27 @@ func changeAttestationConfiguration(fileName, base64Data string, expectedLength
 		return errDataLength
 	}
 
-	ac := attestation.Config{Config: &check.Config{RootOfTrust: &check.RootOfTrust{}, Policy: &check.Policy{}}, PcrConfig: &attestation.PcrConfig{}}
+	ac := check.Config{Policy: &check.Policy{}, RootOfTrust: &check.RootOfTrust{}}
 
-	f, err := os.ReadFile(fileName)
+	attestationPolicy, err := os.ReadFile(fileName)
 	if err != nil {
 		return errors.Wrap(errReadingAttestationPolicyFile, err)
 	}
 
-	if err = attestation.ReadAttestationPolicyFromByte(f, &ac); err != nil {
+	if err = protojson.Unmarshal(attestationPolicy, &ac); err != nil {
 		return errors.Wrap(errUnmarshalJSON, err)
 	}
 
-	if ac.Config.Policy == nil {
-		ac.Config.Policy = &check.Policy{}
-	}
-
 	switch field {
 	case measurementField:
-		ac.Config.Policy.Measurement = data
+		ac.Policy.Measurement = data
 	case hostDataField:
-		ac.Config.Policy.HostData = data
+		ac.Policy.HostData = data
 	default:
 		return errAttestationPolicyField
 	}
 
-	fileJson, err := json.MarshalIndent(&ac, "", " ")
+	fileJson, err := protojson.Marshal(&ac)
 	if err != nil {
 		return errors.Wrap(errMarshalJSON, err)
 	}

cli/attestation_policy_test.go

@@ -4,14 +4,13 @@ package cli
 
 import (
 	"encoding/base64"
-	"encoding/json"
 	"os"
 	"testing"
 
 	"github.com/google/go-sev-guest/proto/check"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/ultravioletrs/cocos/pkg/attestation"
+	"google.golang.org/protobuf/encoding/protojson"
 )
 
 func TestChangeAttestationConfiguration(t *testing.T) {
@@ -19,9 +18,9 @@ func TestChangeAttestationConfiguration(t *testing.T) {
 	require.NoError(t, err)
 	defer os.Remove(tmpfile.Name())
 
-	initialConfig := attestation.Config{Config: &check.Config{RootOfTrust: &check.RootOfTrust{}, Policy: &check.Policy{}}, PcrConfig: &attestation.PcrConfig{}}
+	initialConfig := check.Config{Policy: &check.Policy{}, RootOfTrust: &check.RootOfTrust{}}
 
-	initialJSON, err := json.Marshal(initialConfig)
+	initialJSON, err := protojson.Marshal(&initialConfig)
 	require.NoError(t, err)
 	err = os.WriteFile(tmpfile.Name(), initialJSON, 0o644)
 	require.NoError(t, err)
@@ -87,15 +86,15 @@ func TestChangeAttestationConfiguration(t *testing.T) {
 				content, err := os.ReadFile(tmpfile.Name())
 				require.NoError(t, err)
 
-				ap := attestation.Config{Config: &check.Config{RootOfTrust: &check.RootOfTrust{}, Policy: &check.Policy{}}, PcrConfig: &attestation.PcrConfig{}}
-				err = attestation.ReadAttestationPolicyFromByte(content, &ap)
+				config := check.Config{Policy: &check.Policy{}, RootOfTrust: &check.RootOfTrust{}}
+				err = protojson.Unmarshal(content, &config)
 				require.NoError(t, err)
 
 				decodedData, _ := base64.StdEncoding.DecodeString(tt.base64Data)
 				if tt.field == measurementField {
-					assert.Equal(t, decodedData, ap.Config.Policy.Measurement)
+					assert.Equal(t, decodedData, config.Policy.Measurement)
 				} else if tt.field == hostDataField {
-					assert.Equal(t, decodedData, ap.Config.Policy.HostData)
+					assert.Equal(t, decodedData, config.Policy.HostData)
 				}
 			}
 		})

cli/attestation_test.go

@@ -14,12 +14,10 @@ import (
 	"github.com/google/go-sev-guest/abi"
 	"github.com/google/go-sev-guest/proto/check"
 	"github.com/google/go-sev-guest/proto/sevsnp"
-	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
-	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider"
-	"github.com/ultravioletrs/cocos/pkg/attestation/vtpm"
+	"github.com/ultravioletrs/cocos/agent"
 	"github.com/ultravioletrs/cocos/pkg/sdk/mocks"
 )
 
@@ -34,8 +32,10 @@ func TestNewAttestationCmd(t *testing.T) {
 	var buf bytes.Buffer
 	cmd.SetOut(&buf)
 
-	reportData := bytes.Repeat([]byte{0x01}, quoteprovider.Nonce)
-	mockSDK.On("Attestation", mock.Anything, [quoteprovider.Nonce]byte(reportData), mock.Anything).Return(nil)
+	cmd.SetOutput(&buf)
+
+	reportData := bytes.Repeat([]byte{0x01}, agent.ReportDataSize)
+	mockSDK.On("Attestation", mock.Anything, [agent.ReportDataSize]byte(reportData), mock.Anything).Return(nil)
 
 	cmd.SetArgs([]string{hex.EncodeToString(reportData)})
 	err := cmd.Execute()
@@ -46,11 +46,6 @@ func TestNewAttestationCmd(t *testing.T) {
 func TestNewGetAttestationCmd(t *testing.T) {
 	validattestation, err := os.ReadFile("../attestation.bin")
 	require.NoError(t, err)
-
-	teeNonce := hex.EncodeToString(bytes.Repeat([]byte{0x00}, quoteprovider.Nonce))
-	vtpmNonce := hex.EncodeToString(bytes.Repeat([]byte{0x00}, vtpm.Nonce))
-	tokenNonce := hex.EncodeToString(bytes.Repeat([]byte{0x00}, vtpm.Nonce))
-
 	testCases := []struct {
 		name         string
 		args         []string
@@ -60,117 +55,68 @@ func TestNewGetAttestationCmd(t *testing.T) {
 		expectedOut  string
 	}{
 		{
-			name:         "successful SNP attestation retrieval",
-			args:         []string{"snp", "--tee", teeNonce},
+			name:         "successful attestation retrieval",
+			args:         []string{hex.EncodeToString(bytes.Repeat([]byte{0x01}, agent.ReportDataSize))},
 			mockResponse: []byte("mock attestation"),
 			mockError:    nil,
 			expectedOut:  "Attestation result retrieved and saved successfully!",
 		},
 		{
-			name:         "successful vTPM attestation retrieval",
-			args:         []string{"vtpm", "--vtpm", vtpmNonce},
-			mockResponse: []byte("mock attestation"),
-			mockError:    nil,
-			expectedOut:  "Attestation result retrieved and saved successfully!",
-		},
-		{
-			name:         "successful SNP-vTPM attestation retrieval",
-			args:         []string{"snp-vtpm", "--tee", teeNonce, "--vtpm", vtpmNonce},
-			mockResponse: []byte("mock attestation"),
-			mockError:    nil,
-			expectedOut:  "Attestation result retrieved and saved successfully!",
-		},
-		{
-			name:         "missing vTPM nonce",
-			args:         []string{"snp-vtpm", "--tee", teeNonce},
-			mockResponse: []byte("mock attestation"),
-			mockError:    nil,
-			expectedOut:  "vTPM nonce must be defined for vTPM attestation",
-		},
-		{
-			name:         "missing TEE nonce",
-			args:         []string{"snp-vtpm", "--vtpm", vtpmNonce},
-			mockResponse: []byte("mock attestation"),
-			mockError:    nil,
-			expectedOut:  "TEE nonce must be defined for SEV-SNP attestation",
-		},
-		{
-			name:         "invalid report data size",
-			args:         []string{"snp", "--tee", hex.EncodeToString(bytes.Repeat([]byte{0x00}, 65))},
-			mockResponse: nil,
-			mockError:    errors.New("error"),
-			expectedErr:  "nonce must be a hex encoded string of length lesser or equal 64 bytes",
-		},
-		{
-			name:         "invalid vTPM data size",
-			args:         []string{"vtpm", "--vtpm", hex.EncodeToString(bytes.Repeat([]byte{0x00}, 33))},
-			mockResponse: nil,
-			mockError:    errors.New("error"),
-			expectedErr:  "vTPM nonce must be a hex encoded string of length lesser or equal 32 bytes",
-		},
-		{
-			name:         "invalid arguments",
+			name:         "invalid report data (decoding error)",
 			args:         []string{"invalid"},
 			mockResponse: nil,
 			mockError:    errors.New("error"),
-			expectedErr:  "Bad attestation type: invalid argument ",
+			expectedErr:  "Error decoding report data",
+		},
+		{
+			name:         "invalid report data size",
+			args:         []string{hex.EncodeToString(bytes.Repeat([]byte{0x01}, 32))},
+			mockResponse: nil,
+			mockError:    errors.New("error"),
+			expectedErr:  "report data must be a hex encoded string of length 64 bytes",
+		},
+		{
+			name:         "invalid report data hex",
+			args:         []string{"invalid"},
+			mockResponse: nil,
+			mockError:    errors.New("error"),
+			expectedErr:  "Error decoding report data",
 		},
 		{
 			name:         "failed to get attestation",
-			args:         []string{"snp", "--tee", teeNonce},
+			args:         []string{hex.EncodeToString(bytes.Repeat([]byte{0x01}, agent.ReportDataSize))},
 			mockResponse: nil,
 			mockError:    errors.New("error"),
 			expectedErr:  "Failed to get attestation due to error",
 		},
 		{
-			name:         "Textproto report error",
-			args:         []string{"snp", "--tee", teeNonce, "--reporttextproto"},
+			name:         "JSON report error",
+			args:         []string{hex.EncodeToString(bytes.Repeat([]byte{0x01}, agent.ReportDataSize)), "--json"},
 			mockResponse: []byte("mock attestation"),
 			mockError:    nil,
-			expectedErr:  "Fetching SEV-SNP attestation report\nError converting SNP attestation to JSON: attestation contents too small : attestation contents too small (0x10 bytes). Want at least 0x4a0 bytes ❌\n",
+			expectedErr:  "Error converting attestation to json",
 		},
 		{
-			name:         "successful Textproto report",
-			args:         []string{"snp", "--tee", teeNonce, "--reporttextproto"},
+			name:         "successful JSON report",
+			args:         []string{hex.EncodeToString(bytes.Repeat([]byte{0x01}, agent.ReportDataSize)), "--json"},
 			mockResponse: validattestation,
 			mockError:    nil,
 			expectedOut:  "Attestation result retrieved and saved successfully!",
 		},
 		{
 			name:         "connection error",
-			args:         []string{"snp", "--tee", teeNonce},
+			args:         []string{hex.EncodeToString(bytes.Repeat([]byte{0x01}, agent.ReportDataSize))},
 			mockResponse: nil,
 			mockError:    errors.New("failed to connect to agent"),
 			expectedErr:  "Failed to connect to agent",
 		},
-		{
-			name:         "successful Azure token retrieval",
-			args:         []string{"azure-token", "--token", tokenNonce},
-			mockResponse: []byte("eyJhbGciOiAiUlMyNTYifQ.eyJzdWIiOiAidGVzdC11c2VyIn0.signature"),
-			mockError:    nil,
-			expectedOut:  "Fetching Azure token\nAttestation result retrieved and saved successfully!\n",
-		},
-		{
-			name:         "failed to retrieve Azure token",
-			args:         []string{"azure-token", "--token", tokenNonce},
-			mockResponse: nil,
-			mockError:    errors.New("error"),
-			expectedErr:  "Fetching Azure token\nFailed to get attestation result due to error: error ❌\n",
-		},
-		{
-			name:         "invalid token nonce size",
-			args:         []string{"azure-token", "--token", hex.EncodeToString(bytes.Repeat([]byte{0x00}, 33))},
-			mockResponse: nil,
-			mockError:    errors.New("error"),
-			expectedErr:  "Fetching Azure token\nvTPM nonce must be a hex encoded string of length lesser or equal 32 bytes ❌ \n",
-		},
 	}
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Cleanup(func() {
 				os.Remove(attestationFilePath)
-				os.Remove(attestationReportJson)
+				os.Remove(attestationJson)
 			})
 			mockSDK := new(mocks.SDK)
 			cli := &CLI{agentSDK: mockSDK}
@@ -179,15 +125,10 @@ func TestNewGetAttestationCmd(t *testing.T) {
 			}
 			cmd := cli.NewGetAttestationCmd()
 			var buf bytes.Buffer
-			cmd.SetOut(&buf)
+			cmd.SetOutput(&buf)
 
-			mockSDK.On("Attestation", mock.Anything, [quoteprovider.Nonce]byte(bytes.Repeat([]byte{0x00}, quoteprovider.Nonce)), [vtpm.Nonce]byte(bytes.Repeat([]byte{0x00}, vtpm.Nonce)), mock.Anything, mock.Anything).Return(tc.mockError).Run(func(args mock.Arguments) {
-				_, err := args.Get(4).(*os.File).Write(tc.mockResponse)
-				require.NoError(t, err)
-			})
-
-			mockSDK.On("AttestationResult", mock.Anything, [vtpm.Nonce]byte(bytes.Repeat([]byte{0x00}, vtpm.Nonce)), mock.Anything, mock.Anything).Return(tc.mockError).Run(func(args mock.Arguments) {
-				_, err := args.Get(3).(*os.File).Write(tc.mockResponse)
+			mockSDK.On("Attestation", mock.Anything, [agent.ReportDataSize]byte(bytes.Repeat([]byte{0x01}, agent.ReportDataSize)), mock.Anything).Return(tc.mockError).Run(func(args mock.Arguments) {
+				_, err := args.Get(2).(*os.File).Write(tc.mockResponse)
 				require.NoError(t, err)
 			})
 
@@ -204,13 +145,12 @@ func TestNewGetAttestationCmd(t *testing.T) {
 	}
 }
 
-func TestNewValidateAttestationValidationCmdDefaults(t *testing.T) {
+func TestNewValidateAttestationValidationCmd(t *testing.T) {
 	cli := &CLI{}
 	cmd := cli.NewValidateAttestationValidationCmd()
 
 	assert.Equal(t, "validate", cmd.Use)
-	expectedMessage := fmt.Sprintf("Validate and verify attestation information. You can define the confidential computing cloud provider (%s, %s, %s; %s is the default) and can choose from 3 modes: %s, %s and %s. Default mode is %s.", CCNone, CCAzure, CCGCP, CCNone, SNP, VTPM, SNPvTPM, SNP)
-	assert.Equal(t, expectedMessage, cmd.Short)
+	assert.Equal(t, "Validate and verify attestation information. The report is provided as a file path.", cmd.Short)
 
 	assert.Equal(t, fmt.Sprint(defaultMinimumTcb), cmd.Flag("minimum_tcb").Value.String())
 	assert.Equal(t, fmt.Sprint(defaultMinimumLaunchTcb), cmd.Flag("minimum_lauch_tcb").Value.String())
@@ -222,150 +162,6 @@ func TestNewValidateAttestationValidationCmdDefaults(t *testing.T) {
 	assert.Equal(t, fmt.Sprint(defaultMaxRetryDelay), cmd.Flag("max_retry_delay").Value.String())
 }
 
-func TestNewValidateAttestationValidationCmd(t *testing.T) {
-	cli := &CLI{}
-	cmd := cli.NewValidateAttestationValidationCmd()
-
-	t.Run("missing attestation report file path", func(t *testing.T) {
-		err := cmd.Execute()
-		assert.Error(t, err)
-		assert.Equal(t, "please pass the attestation report file path", err.Error())
-	})
-
-	t.Run("unknown mode", func(t *testing.T) {
-		cmd.SetArgs([]string{attestationFilePath, "--mode=invalid"})
-		err := cmd.Execute()
-		assert.Error(t, err)
-		assert.Contains(t, err.Error(), "unknown mode")
-	})
-
-	t.Run("snp mode with missing flags", func(t *testing.T) {
-		cmd.SetArgs([]string{attestationFilePath, "--mode=snp"})
-		err := cmd.Execute()
-		assert.Error(t, err)
-		assert.Contains(t, err.Error(), "required flag(s) \"product\", \"report_data\" not set")
-	})
-
-	t.Run("vtpm mode with missing flags", func(t *testing.T) {
-		cmd.SetArgs([]string{vtpmFilePath, "--mode=vtpm"})
-		err := cmd.Execute()
-		assert.Error(t, err)
-		assert.Contains(t, err.Error(), "required flag(s) \"format\", \"nonce\", \"output\", \"product\", \"report_data\" not set")
-	})
-
-	t.Run("snp-vtpm mode with missing flags", func(t *testing.T) {
-		cmd.SetArgs([]string{vtpmFilePath, "--mode=snp-vtpm"})
-		err := cmd.Execute()
-		assert.Error(t, err)
-		assert.Contains(t, err.Error(), "required flag(s) \"format\", \"nonce\", \"output\", \"product\", \"report_data\" not set")
-	})
-
-	t.Run("valid snp mode execution", func(t *testing.T) {
-		cli := CLI{}
-		cmd := cli.NewValidateAttestationValidationCmd()
-
-		cmd.RunE = func(_ *cobra.Command, _ []string) error {
-			t.Log("Mock RunE executed instead of sevsnpverify")
-			return nil
-		}
-
-		cmd.SetArgs([]string{
-			"../attestation.bin",
-			"--mode=snp",
-			"--report_data=" +
-				"11223344556677889900aabbccddeeff11223344556677889900aabbccddeeff" +
-				"11223344556677889900aabbccddeeff11223344556677889900aabbccddeeff",
-			"--product=Milan",
-		})
-		err := cmd.PreRunE(cmd, []string{"../attestation.bin"})
-		assert.NoError(t, err)
-	})
-
-	t.Run("valid vtpm mode execution", func(t *testing.T) {
-		cli := CLI{}
-		cmd := cli.NewValidateAttestationValidationCmd()
-
-		cmd.RunE = func(_ *cobra.Command, _ []string) error {
-			t.Log("Mock RunE executed instead of vtpmverify")
-			return nil
-		}
-
-		cmd.SetArgs([]string{vtpmFilePath, "--mode=vtpm", "--nonce=123abc", "--format=binarypb", "--output=some_output"})
-
-		err := cmd.PreRunE(cmd, []string{"../quote.dat"})
-		assert.NoError(t, err)
-	})
-
-	t.Run("valid snp-vtpm mode execution", func(t *testing.T) {
-		cli := CLI{}
-		cmd := cli.NewValidateAttestationValidationCmd()
-
-		cmd.RunE = func(_ *cobra.Command, _ []string) error {
-			t.Log("Mock RunE executed instead of vtpmSevSnpverify")
-			return nil
-		}
-
-		cmd.SetArgs([]string{vtpmFilePath, "--mode=snp-vtpm", "--nonce=123abc", "--format=textproto", "--output=some_output"})
-		err := cmd.PreRunE(cmd, []string{"../quote.dat"})
-		assert.NoError(t, err)
-	})
-}
-
-type MockMeasurement struct {
-	mock.Mock
-}
-
-func (m *MockMeasurement) Run(igvmBinaryPath string) ([]byte, error) {
-	args := m.Called(igvmBinaryPath)
-	return nil, args.Error(0)
-}
-
-func (m *MockMeasurement) Stop() error {
-	args := m.Called()
-	return args.Error(0)
-}
-
-func TestNewMeasureCmd_RunSuccess(t *testing.T) {
-	cliInstance := &CLI{}
-	mockMeasurement := new(MockMeasurement)
-	cliInstance.measurement = mockMeasurement
-
-	mockMeasurement.On("Run", "testfile.igvm").Return(nil)
-
-	cmd := cliInstance.NewMeasureCmd("fake_binary_path")
-	buf := new(bytes.Buffer)
-	cmd.SetOut(buf)
-	cmd.SetErr(buf)
-	cmd.SetArgs([]string{"testfile.igvm"})
-
-	err := cmd.Execute()
-
-	assert.NoError(t, err)
-	mockMeasurement.AssertExpectations(t)
-}
-
-func TestNewMeasureCmd_RunError(t *testing.T) {
-	cliInstance := &CLI{}
-	mockMeasurement := new(MockMeasurement)
-	cliInstance.measurement = mockMeasurement
-	expectedError := errors.New("mocked measurement error")
-
-	mockMeasurement.On("Run", "testfile.igvm").Return(expectedError)
-
-	cmd := cliInstance.NewMeasureCmd("fake_binary_path")
-
-	buf := new(bytes.Buffer)
-	cmd.SetOut(buf)
-	cmd.SetErr(buf)
-	cmd.SetArgs([]string{"testfile.igvm"})
-
-	err := cmd.Execute()
-
-	assert.Error(t, err)
-	assert.Equal(t, expectedError.Error(), err.Error())
-	mockMeasurement.AssertExpectations(t)
-}
-
 func TestParseConfig(t *testing.T) {
 	cfgString = ""
 	err := parseConfig()
@@ -418,11 +214,9 @@ func TestParseFiles(t *testing.T) {
 	trustedAuthorKeys = []string{authorKeyFile}
 	trustedIdKeys = []string{idKeyFile}
 
-	err = parseAttestationFile()
+	err = parseFiles()
 	assert.NoError(t, err)
-	err = parseTrustedKeys()
-	assert.NoError(t, err)
-	assert.Equal(t, []byte("test attestation"), attestationRaw)
+	assert.Equal(t, []byte("test attestation"), attestation)
 	assert.Len(t, cfg.Policy.TrustedAuthorKeys, 1)
 	assert.Len(t, cfg.Policy.TrustedIdKeys, 1)
 
@@ -431,7 +225,7 @@ func TestParseFiles(t *testing.T) {
 	os.Remove(idKeyFile)
 
 	attestationFile = "non_existent_file.bin"
-	err = parseAttestationFile()
+	err = parseFiles()
 	assert.Error(t, err)
 }
 
@@ -654,56 +448,3 @@ func TestRoundTrip(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, roundTripReport)
 }
-
-func TestDecodeJWTToJSON(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    []byte
-		err      error
-		validate func(t *testing.T, output []byte)
-	}{
-		{
-			name: "Valid JWT",
-			input: []byte("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9." +
-				"eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ." +
-				"SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"),
-			err: nil,
-			validate: func(t *testing.T, output []byte) {
-				assert.NotEmpty(t, output)
-				assert.Contains(t, string(output), `"header"`)
-				assert.Contains(t, string(output), `"payload"`)
-			},
-		},
-		{
-			name:  "Invalid JWT - one part",
-			input: []byte("justonepart"),
-			err:   fmt.Errorf("invalid JWT: must have at least 2 parts"),
-			validate: func(t *testing.T, output []byte) {
-				assert.Nil(t, output)
-			},
-		},
-		{
-			name:  "Invalid Base64",
-			input: []byte("bad@@@.header"),
-			err:   errors.New("illegal base64 data"),
-			validate: func(t *testing.T, output []byte) {
-				assert.Nil(t, output)
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := decodeJWTToJSON(tt.input)
-
-			if tt.err != nil {
-				assert.Error(t, err)
-				assert.Contains(t, err.Error(), tt.err.Error())
-			} else {
-				assert.NoError(t, err)
-			}
-
-			tt.validate(t, got)
-		})
-	}
-}

cli/cache.go

@@ -12,7 +12,7 @@ import (
 	"github.com/google/go-sev-guest/proto/check"
 	"github.com/google/go-sev-guest/verify/trust"
 	"github.com/spf13/cobra"
-	"github.com/ultravioletrs/cocos/pkg/attestation"
+	"github.com/ultravioletrs/cocos/pkg/clients/grpc"
 )
 
 const (
@@ -27,14 +27,14 @@ func (cli *CLI) NewCABundleCmd(fileSavePath string) *cobra.Command {
 		Example: "ca-bundle <path_to_platform_info_json>",
 		Args:    cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
-			attestationConfiguration := attestation.Config{Config: &check.Config{Policy: &check.Policy{}, RootOfTrust: &check.RootOfTrust{}}, PcrConfig: &attestation.PcrConfig{}}
-			err := attestation.ReadAttestationPolicy(args[0], &attestationConfiguration)
+			attestationConfiguration := check.Config{Policy: &check.Policy{}, RootOfTrust: &check.RootOfTrust{}}
+			err := grpc.ReadAttestationPolicy(args[0], &attestationConfiguration)
 			if err != nil {
 				printError(cmd, "Error while reading manifest: %v ❌ ", err)
 				return
 			}
 
-			product := attestationConfiguration.Config.RootOfTrust.ProductLine
+			product := attestationConfiguration.RootOfTrust.ProductLine
 
 			getter := trust.DefaultHTTPSGetter()
 			caURL := kds.ProductCertChainURL(abi.VcekReportSigner, product)

cli/ima_measurements.go

@@ -1,96 +0,0 @@
-// Copyright (c) Ultraviolet
-// SPDX-License-Identifier: Apache-2.0
-package cli
-
-import (
-	"bufio"
-	"crypto/sha1"
-	"encoding/hex"
-	"os"
-	"strings"
-
-	"github.com/fatih/color"
-	"github.com/spf13/cobra"
-	"github.com/ultravioletrs/cocos/pkg/attestation/vtpm"
-)
-
-const (
-	imaMeasurementsFilename = "ima_measurements"
-)
-
-func (cli *CLI) NewIMAMeasurementsCmd() *cobra.Command {
-	return &cobra.Command{
-		Use:     "ima-measurements",
-		Short:   "Retrieve Linux IMA measurements file",
-		Example: "ima-measurements <optional_file_name>",
-		Run: func(cmd *cobra.Command, args []string) {
-			if cli.connectErr != nil {
-				printError(cmd, "Failed to connect to agent: %v ❌ ", cli.connectErr)
-				return
-			}
-
-			cmd.Println("⏳ Retrieving computation Linux IMA measurements file")
-
-			filename := imaMeasurementsFilename
-			if len(args) >= 1 {
-				filename = args[0]
-			}
-
-			imaMeasurementsFile, err := os.Create(filename)
-			if err != nil {
-				printError(cmd, "Error creating imaMeasurements file: %v ❌ ", err)
-				return
-			}
-			defer imaMeasurementsFile.Close()
-
-			pcr10, err := cli.agentSDK.IMAMeasurements(cmd.Context(), imaMeasurementsFile)
-			if err != nil {
-				printError(cmd, "Error retrieving Linux IMA measurements file: %v ❌ ", err)
-				return
-			}
-
-			cmd.Println(color.New(color.FgGreen).Sprintf("Linux IMA measurements file retrieved and saved successfully as %s! PCR10 = %s ✔ ", filename, hex.EncodeToString(pcr10)))
-
-			calculatedPCR10 := make([]byte, vtpm.Hash1)
-
-			file, err := os.Open(filename)
-			if err != nil {
-				printError(cmd, "Failed to open file: %v ❌ ", err)
-			}
-			defer file.Close()
-
-			scanner := bufio.NewScanner(file)
-
-			for scanner.Scan() {
-				line := scanner.Text()
-				parts := strings.Fields(line)
-
-				if parts[0] != "10" {
-					continue
-				}
-
-				digestHex := parts[1]
-				if digestHex == strings.Repeat("0", 40) {
-					digestHex = strings.Repeat("f", 40)
-				}
-
-				digest, err := hex.DecodeString(digestHex)
-				if err != nil {
-					printError(cmd, "Failed to decode digest: %v ❌ ", err)
-					continue
-				}
-
-				hasher := sha1.New()
-				hasher.Write(calculatedPCR10)
-				hasher.Write(digest)
-				calculatedPCR10 = hasher.Sum(nil)
-			}
-
-			if hex.EncodeToString(pcr10) != hex.EncodeToString(calculatedPCR10) {
-				printError(cmd, "Measurements file not verified ❌ ", err)
-			} else {
-				cmd.Println(color.New(color.FgGreen).Sprintf("Measurements file verified!"))
-			}
-		},
-	}
-}

cli/manager.go

@@ -4,7 +4,6 @@ package cli
 
 import (
 	"os"
-	"time"
 
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
@@ -16,9 +15,7 @@ const (
 	serverCA  = "server-ca"
 	clientKey = "client-key"
 	clientCrt = "client-crt"
-	caUrl     = "ca-url"
 	logLevel  = "log-level"
-	ttlFlag   = "ttl"
 )
 
 var (
@@ -26,9 +23,7 @@ var (
 	agentCVMServerCA  string
 	agentCVMClientKey string
 	agentCVMClientCrt string
-	agentCVMCaUrl     string
 	agentLogLevel     string
-	ttl               time.Duration
 )
 
 func (c *CLI) NewCreateVMCmd() *cobra.Command {
@@ -52,11 +47,6 @@ func (c *CLI) NewCreateVMCmd() *cobra.Command {
 
 			createReq.AgentCvmServerUrl = agentCVMServerUrl
 			createReq.AgentLogLevel = agentLogLevel
-			createReq.AgentCvmCaUrl = agentCVMCaUrl
-
-			if ttl > 0 {
-				createReq.Ttl = ttl.String()
-			}
 
 			cmd.Println("🔗 Creating a new virtual machine")
 
@@ -66,7 +56,7 @@ func (c *CLI) NewCreateVMCmd() *cobra.Command {
 				return
 			}
 
-			cmd.Println(color.New(color.FgGreen).Sprintf("✅ Virtual machine created successfully with id %s and port %s", res.CvmId, res.ForwardedPort))
+			cmd.Println(color.New(color.FgGreen).Sprintf("✅ Virtual machine created successfully with id %s and port %s", res.SvmId, res.ForwardedPort))
 		},
 	}
 
@@ -74,13 +64,7 @@ func (c *CLI) NewCreateVMCmd() *cobra.Command {
 	cmd.Flags().StringVar(&agentCVMServerCA, serverCA, "", "CVM server CA")
 	cmd.Flags().StringVar(&agentCVMClientKey, clientKey, "", "CVM client key")
 	cmd.Flags().StringVar(&agentCVMClientCrt, clientCrt, "", "CVM client crt")
-	cmd.Flags().StringVar(&agentCVMCaUrl, agentCVMCaUrl, "", "CVM CA service URL")
 	cmd.Flags().StringVar(&agentLogLevel, logLevel, "", "Agent Log level")
-	cmd.Flags().DurationVar(&ttl, ttlFlag, 0, "TTL for the VM")
-	if err := cmd.MarkFlagRequired(serverURL); err != nil {
-		printError(cmd, "Error marking flag as required: %v ❌ ", err)
-		return cmd
-	}
 
 	return cmd
 }
@@ -89,7 +73,7 @@ func (c *CLI) NewRemoveVMCmd() *cobra.Command {
 	return &cobra.Command{
 		Use:     "remove-vm",
 		Short:   "Remove a virtual machine",
-		Example: `remove-vm <cvm_id>`,
+		Example: `remove-vm <svm_id>`,
 		Args:    cobra.ExactArgs(1),
 		Run: func(cmd *cobra.Command, args []string) {
 			if err := c.InitializeManagerClient(cmd); err == nil {
@@ -103,7 +87,7 @@ func (c *CLI) NewRemoveVMCmd() *cobra.Command {
 
 			cmd.Println("🔗 Removing virtual machine")
 
-			_, err := c.managerClient.RemoveVm(cmd.Context(), &manager.RemoveReq{CvmId: args[0]})
+			_, err := c.managerClient.RemoveVm(cmd.Context(), &manager.RemoveReq{SvmId: args[0]})
 			if err != nil {
 				printError(cmd, "Error removing virtual machine: %v ❌ ", err)
 				return

cli/sdk.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/ultravioletrs/cocos/manager"
-	"github.com/ultravioletrs/cocos/pkg/attestation/cmdconfig"
 	"github.com/ultravioletrs/cocos/pkg/clients/grpc"
 	"github.com/ultravioletrs/cocos/pkg/clients/grpc/agent"
 	managergrpc "github.com/ultravioletrs/cocos/pkg/clients/grpc/manager"
@@ -23,14 +22,12 @@ type CLI struct {
 	client        grpc.Client
 	managerClient manager.ManagerServiceClient
 	connectErr    error
-	measurement   cmdconfig.MeasurementProvider
 }
 
-func New(agentConfig grpc.AgentClientConfig, managerConfig grpc.ManagerClientConfig, measurement cmdconfig.MeasurementProvider) *CLI {
+func New(agentConfig grpc.AgentClientConfig, managerConfig grpc.ManagerClientConfig) *CLI {
 	return &CLI{
 		agentConfig:   agentConfig,
 		managerConfig: managerConfig,
-		measurement:   measurement,
 	}
 }
 
@@ -40,7 +37,7 @@ func (c *CLI) InitializeAgentSDK(cmd *cobra.Command) error {
 		c.connectErr = err
 		return err
 	}
-	cmd.Println("🔗 Connected to agent ", agentGRPCClient.Secure())
+	cmd.Println("🔗 Connected to agent using ", agentGRPCClient.Secure())
 	c.client = agentGRPCClient
 
 	c.agentSDK = sdk.NewAgentSDK(agentClient)

cmd/agent/main.go

@@ -4,10 +4,6 @@ package main
 
 import (
 	"context"
-	"crypto/sha256"
-	"crypto/sha512"
-	"crypto/x509"
-	"encoding/pem"
 	"fmt"
 	"log"
 	"log/slog"
@@ -19,18 +15,17 @@ import (
 	mglog "github.com/absmach/magistrala/logger"
 	"github.com/absmach/magistrala/pkg/prometheus"
 	"github.com/caarlos0/env/v11"
+	"github.com/google/go-sev-guest/client"
 	"github.com/ultravioletrs/cocos/agent"
 	"github.com/ultravioletrs/cocos/agent/api"
 	"github.com/ultravioletrs/cocos/agent/cvms"
-	cvmsapi "github.com/ultravioletrs/cocos/agent/cvms/api/grpc"
+	cvmapi "github.com/ultravioletrs/cocos/agent/cvms/api/grpc"
 	"github.com/ultravioletrs/cocos/agent/cvms/server"
 	"github.com/ultravioletrs/cocos/agent/events"
 	agentlogger "github.com/ultravioletrs/cocos/internal/logger"
-	"github.com/ultravioletrs/cocos/pkg/attestation"
-	"github.com/ultravioletrs/cocos/pkg/attestation/azure"
-	"github.com/ultravioletrs/cocos/pkg/attestation/vtpm"
+	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider"
 	pkggrpc "github.com/ultravioletrs/cocos/pkg/clients/grpc"
-	cvmsgrpc "github.com/ultravioletrs/cocos/pkg/clients/grpc/cvm"
+	cvmgrpc "github.com/ultravioletrs/cocos/pkg/clients/grpc/cvm"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -39,19 +34,10 @@ const (
 	defSvcGRPCPort   = "7002"
 	retryInterval    = 5 * time.Second
 	envPrefixCVMGRPC = "AGENT_CVM_GRPC_"
-	storageDir       = "/var/lib/cocos/agent"
 )
 
 type config struct {
-	LogLevel      string `env:"AGENT_LOG_LEVEL"  envDefault:"debug"`
-	Vmpl          int    `env:"AGENT_VMPL"       envDefault:"2"`
-	AgentGrpcHost string `env:"AGENT_GRPC_HOST"  envDefault:"0.0.0.0"`
-	CAUrl         string `env:"AGENT_CVM_CA_URL" envDefault:""`
-	CVMId         string `env:"AGENT_CVM_ID"     envDefault:""`
-	AgentMaaURL   string `env:"AGENT_MAA_URL"    envDefault:"https://sharedeus2.eus2.attest.azure.net"`
-	AgentOSBuild  string `env:"AGENT_OS_BUILD"   envDefault:"UVC"`
-	AgentOSDistro string `env:"AGENT_OS_DISTRO"  envDefault:"UVC"`
-	AgentOSType   string `env:"AGENT_OS_TYPE"    envDefault:"UVC"`
+	LogLevel string `env:"AGENT_LOG_LEVEL" envDefault:"debug"`
 }
 
 func main() {
@@ -85,27 +71,11 @@ func main() {
 		return
 	}
 
-	var provider attestation.Provider
-	ccPlatform := attestation.CCPlatform()
-
-	azureConfig := azure.NewEnvConfigFromAgent(
-		cfg.AgentOSBuild,
-		cfg.AgentOSType,
-		cfg.AgentOSDistro,
-		cfg.AgentMaaURL,
-	)
-	azure.InitializeDefaultMAAVars(azureConfig)
-
-	switch ccPlatform {
-	case attestation.SNP:
-		provider = vtpm.New(nil, false, uint(cfg.Vmpl), nil)
-	case attestation.SNPvTPM:
-		provider = vtpm.New(nil, true, uint(cfg.Vmpl), nil)
-	case attestation.Azure:
-		provider = azure.New(nil)
-	case attestation.NoCC:
-		logger.Info("TEE device not found")
-		provider = &attestation.EmptyProvider{}
+	qp, err := quoteprovider.GetQuoteProvider()
+	if err != nil {
+		logger.Error(fmt.Sprintf("failed to create quote provider %s", err.Error()))
+		exitCode = 1
+		return
 	}
 
 	cvmGrpcConfig := pkggrpc.CVMClientConfig{}
@@ -115,7 +85,7 @@ func main() {
 		return
 	}
 
-	cvmGRPCClient, cvmsClient, err := cvmsgrpc.NewCVMClient(cvmGrpcConfig)
+	cvmGRPCClient, cvmClient, err := cvmgrpc.NewCVMClient(cvmGrpcConfig)
 	if err != nil {
 		logger.Error(err.Error())
 		exitCode = 1
@@ -123,48 +93,16 @@ func main() {
 	}
 	defer cvmGRPCClient.Close()
 
-	reconnectFn := func(ctx context.Context) (pkggrpc.Client, cvms.Service_ProcessClient, error) {
-		grpcClient, newClient, err := cvmsgrpc.NewCVMClient(cvmGrpcConfig)
-		if err != nil {
-			return nil, nil, err
-		}
-		// Don't defer close here as we want to keep the connection open
-
-		pc, err := newClient.Process(ctx)
-		if err != nil {
-			grpcClient.Close()
-			return nil, nil, err
-		}
-		return grpcClient, pc, nil
-	}
-
-	pc, err := cvmsClient.Process(ctx)
+	pc, err := cvmClient.Process(ctx)
 	if err != nil {
 		logger.Error(err.Error())
 		exitCode = 1
 		return
 	}
 
-	if cfg.Vmpl < 0 || cfg.Vmpl > 3 {
-		logger.Error("vmpl level must be in a range [0, 3]")
-		exitCode = 1
-		return
-	}
+	svc := newService(ctx, logger, eventSvc, qp)
 
-	svc := newService(ctx, logger, eventSvc, provider, cfg.Vmpl)
-
-	if err := os.MkdirAll(storageDir, 0o755); err != nil {
-		logger.Error(fmt.Sprintf("failed to create storage directory: %s", err))
-		exitCode = 1
-		return
-	}
-
-	mc, err := cvmsapi.NewClient(pc, svc, eventsLogsQueue, logger, server.NewServer(logger, svc, cfg.AgentGrpcHost, cfg.CAUrl, cfg.CVMId), storageDir, reconnectFn, cvmGRPCClient)
-	if err != nil {
-		logger.Error(err.Error())
-		exitCode = 1
-		return
-	}
+	mc := cvmapi.NewClient(pc, svc, eventsLogsQueue, logger, server.NewServer(logger, svc))
 
 	g.Go(func() error {
 		ch := make(chan os.Signal, 1)
@@ -185,46 +123,13 @@ func main() {
 		return mc.Process(ctx, cancel)
 	})
 
-	attest, certSerialNumber, err := attestationFromCert(ctx, cvmGrpcConfig.ClientCert, svc)
-	if err != nil {
-		logger.Error(fmt.Sprintf("failed to get attestation: %s", err))
-		exitCode = 1
-		return
-	}
-
-	if ccPlatform == attestation.Azure {
-		azureAttestationResult, azureCertSerialNumber, err := azureAttestationFromCert(ctx, cvmGrpcConfig.ClientCert, svc)
-		if err != nil {
-			logger.Error(fmt.Sprintf("failed to get attestation: %s", err))
-			exitCode = 1
-			return
-		}
-		eventsLogsQueue <- &cvms.ClientStreamMessage{
-			Message: &cvms.ClientStreamMessage_AzureAttestationResult{
-				AzureAttestationResult: &cvms.AzureAttestationResponse{
-					File:             azureAttestationResult,
-					CertSerialNumber: azureCertSerialNumber,
-				},
-			},
-		}
-	}
-
-	eventsLogsQueue <- &cvms.ClientStreamMessage{
-		Message: &cvms.ClientStreamMessage_VTPMattestationReport{
-			VTPMattestationReport: &cvms.AttestationResponse{
-				File:             attest,
-				CertSerialNumber: certSerialNumber,
-			},
-		},
-	}
-
 	if err := g.Wait(); err != nil {
 		logger.Error(fmt.Sprintf("%s service terminated: %s", svcName, err))
 	}
 }
 
-func newService(ctx context.Context, logger *slog.Logger, eventSvc events.Service, provider attestation.Provider, vmpl int) agent.Service {
-	svc := agent.New(ctx, logger, eventSvc, provider, vmpl)
+func newService(ctx context.Context, logger *slog.Logger, eventSvc events.Service, qp client.QuoteProvider) agent.Service {
+	svc := agent.New(ctx, logger, eventSvc, qp)
 
 	svc = api.LoggingMiddleware(svc, logger)
 	counter, latency := prometheus.MakeMetrics(svcName, "api")
@@ -232,54 +137,3 @@ func newService(ctx context.Context, logger *slog.Logger, eventSvc events.Servic
 
 	return svc
 }
-
-func attestationFromCert(ctx context.Context, certFilePath string, svc agent.Service) ([]byte, string, error) {
-	if certFilePath == "" {
-		return nil, "", nil
-	}
-
-	certFile, err := os.ReadFile(certFilePath)
-	if err != nil {
-		return nil, "", err
-	}
-
-	certPem, _ := pem.Decode(certFile)
-	certx509, err := x509.ParseCertificate(certPem.Bytes)
-	if err != nil {
-		return nil, "", err
-	}
-
-	nonceSNP := sha512.Sum512(certFile)
-	nonceVTPM := sha256.Sum256(certFile)
-	attest, err := svc.Attestation(ctx, nonceSNP, nonceVTPM, attestation.SNPvTPM)
-	if err != nil {
-		return nil, "", err
-	}
-
-	return attest, certx509.SerialNumber.String(), nil
-}
-
-func azureAttestationFromCert(ctx context.Context, certFilePath string, svc agent.Service) ([]byte, string, error) {
-	if certFilePath == "" {
-		return nil, "", nil
-	}
-
-	certFile, err := os.ReadFile(certFilePath)
-	if err != nil {
-		return nil, "", err
-	}
-
-	certPem, _ := pem.Decode(certFile)
-	certx509, err := x509.ParseCertificate(certPem.Bytes)
-	if err != nil {
-		return nil, "", err
-	}
-
-	nonceAzure := sha256.Sum256(certFile)
-	attestation, err := svc.AttestationResult(ctx, nonceAzure, attestation.AzureToken)
-	if err != nil {
-		return nil, "", err
-	}
-
-	return attestation, certx509.SerialNumber.String(), nil
-}

cmd/cli/main.go

@@ -14,7 +14,6 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/ultravioletrs/cocos/cli"
-	"github.com/ultravioletrs/cocos/pkg/attestation/cmdconfig"
 	"github.com/ultravioletrs/cocos/pkg/clients/grpc"
 	cmd "github.com/virtee/sev-snp-measure-go/sevsnpmeasure/cmd"
 )
@@ -29,8 +28,7 @@ const (
 )
 
 type config struct {
-	LogLevel       string `env:"AGENT_LOG_LEVEL" envDefault:"info"`
-	IgvmBinaryPath string `env:"IGVM_BINARY_PATH" envDefault:"./build/igvmmeasure"`
+	LogLevel string `env:"AGENT_LOG_LEVEL" envDefault:"info"`
 }
 
 func main() {
@@ -108,15 +106,7 @@ func main() {
 		return
 	}
 
-	options := cmdconfig.IgvmMeasureOptions
-	measurement, err := cmdconfig.NewCmdConfig(cfg.IgvmBinaryPath, options, os.Stderr)
-	if err != nil {
-		message := color.New(color.FgRed).Sprintf("failed to initialize measurement: %s", err) // Use %s instead of %w
-		rootCmd.Println(message)
-		return
-	}
-
-	cliSVC := cli.New(agentGRPCConfig, managerGRPCConfig, measurement)
+	cliSVC := cli.New(agentGRPCConfig, managerGRPCConfig)
 
 	if err := cliSVC.InitializeAgentSDK(rootCmd); err == nil {
 		defer cliSVC.Close()
@@ -139,7 +129,6 @@ func main() {
 	rootCmd.AddCommand(cliSVC.NewCABundleCmd(directoryCachePath))
 	rootCmd.AddCommand(cliSVC.NewCreateVMCmd())
 	rootCmd.AddCommand(cliSVC.NewRemoveVMCmd())
-	rootCmd.AddCommand(cliSVC.NewIMAMeasurementsCmd())
 
 	// Attestation commands
 	attestationCmd.AddCommand(cliSVC.NewGetAttestationCmd())
@@ -147,7 +136,6 @@ func main() {
 
 	// measure.
 	rootCmd.AddCommand(cmd.NewRootCmd())
-	rootCmd.AddCommand(cliSVC.NewMeasureCmd(cfg.IgvmBinaryPath))
 
 	// Flags
 	keysCmd.PersistentFlags().StringVarP(
@@ -161,9 +149,6 @@ func main() {
 	// Attestation Policy commands
 	attestationPolicyCmd.AddCommand(cliSVC.NewAddMeasurementCmd())
 	attestationPolicyCmd.AddCommand(cliSVC.NewAddHostDataCmd())
-	attestationPolicyCmd.AddCommand(cliSVC.NewGCPAttestationPolicy())
-	attestationPolicyCmd.AddCommand(cliSVC.NewDownloadGCPOvmfFile())
-	attestationPolicyCmd.AddCommand(cliSVC.NewAzureAttestationPolicy())
 
 	if err := rootCmd.Execute(); err != nil {
 		logErrorCmd(*rootCmd, err)

cmd/manager/main.go

@@ -42,9 +42,7 @@ type config struct {
 	JaegerURL               url.URL `env:"COCOS_JAEGER_URL"                   envDefault:"http://localhost:4318"`
 	TraceRatio              float64 `env:"COCOS_JAEGER_TRACE_RATIO"           envDefault:"1.0"`
 	InstanceID              string  `env:"MANAGER_INSTANCE_ID"                envDefault:""`
-	AttestationPolicyBinary string  `env:"MANAGER_ATTESTATION_POLICY_BINARY"  envDefault:"../../build/attestation_policy"`
-	IgvmMeasureBinary       string  `env:"MANAGER_IGVMMEASURE_BINARY"         envDefault:"../../build/igvmmeasure"`
-	PcrValues               string  `env:"MANAGER_PCR_VALUES"                 envDefault:""`
+	AttestationPolicyBinary string  `env:"MANAGER_ATTESTATION_POLICY_BINARY"  envDefault:"../../build"`
 	EosVersion              string  `env:"MANAGER_EOS_VERSION"                envDefault:""`
 }
 
@@ -84,23 +82,7 @@ func main() {
 	}()
 	tracer := tp.Tracer(svcName)
 
-	qemuCfg, err := qemu.NewConfig()
-	if err != nil {
-		logger.Error(fmt.Sprintf("failed to create config: %v", err))
-		exitCode = 1
-		return
-	}
-
-	if qemuCfg.EnableTDX {
-	logger.Info("Manager started with TDX enabled")
-	} else if qemuCfg.EnableSEVSNP {
-		logger.Info("Manager started with SEV-SNP enabled")
-	} else if qemuCfg.EnableSEV {
-		logger.Info("Manager started with SEV enabled")
-	} else {
-		logger.Info("Manager started without confidential computing support")
-	}
-
+	qemuCfg := qemu.Config{}
 	if err := env.ParseWithOptions(&qemuCfg, env.Options{Prefix: envPrefixQemu}); err != nil {
 		logger.Error(fmt.Sprintf("failed to load QEMU configuration: %s", err))
 		exitCode = 1
@@ -116,7 +98,7 @@ func main() {
 		return
 	}
 
-	svc, err := newService(ctx, logger, tracer, *qemuCfg, cfg.AttestationPolicyBinary, cfg.IgvmMeasureBinary, cfg.PcrValues, cfg.EosVersion)
+	svc, err := newService(logger, tracer, qemuCfg, cfg.AttestationPolicyBinary, cfg.EosVersion)
 	if err != nil {
 		logger.Error(err.Error())
 		exitCode = 1
@@ -128,7 +110,7 @@ func main() {
 		manager.RegisterManagerServiceServer(srv, managergrpc.NewServer(svc))
 	}
 
-	gs := grpcserver.New(ctx, cancel, svcName, managerGRPCConfig, registerManagerServiceServer, logger, nil, "", "")
+	gs := grpcserver.New(ctx, cancel, svcName, managerGRPCConfig, registerManagerServiceServer, logger, nil, nil)
 
 	g.Go(func() error {
 		return gs.Start()
@@ -143,8 +125,8 @@ func main() {
 	}
 }
 
-func newService(ctx context.Context, logger *slog.Logger, tracer trace.Tracer, qemuCfg qemu.Config, attestationPolicyPath string, igvmMeasurementBinaryPath string, pcrValuesFilePath string, eosVersion string) (manager.Service, error) {
-	svc, err := manager.New(ctx, qemuCfg, attestationPolicyPath, igvmMeasurementBinaryPath, pcrValuesFilePath, logger, qemu.NewVM, eosVersion)
+func newService(logger *slog.Logger, tracer trace.Tracer, qemuCfg qemu.Config, attestationPolicyPath string, eosVersion string) (manager.Service, error) {
+	svc, err := manager.New(qemuCfg, attestationPolicyPath, logger, qemu.NewVM, eosVersion)
 	if err != nil {
 		return nil, err
 	}

cocos-manager.env

@@ -7,8 +7,6 @@ COCOS_JAEGER_TRACE_RATIO=1.0
 # Manager Service Configuration
 MANAGER_INSTANCE_ID=
 MANAGER_ATTESTATION_POLICY_BINARY=../../build
-MANAGER_IGVMMEASURE_BINARY=../../build
-MANAGER_PCR_VALUES=/etc/cocos/pcr_values.json
 MANAGER_GRPC_CLIENT_CERT=
 MANAGER_GRPC_CLIENT_KEY=
 MANAGER_GRPC_SERVER_CA_CERTS=
@@ -44,9 +42,6 @@ MANAGER_QEMU_SEV_ID=sev0
 MANAGER_QEMU_SEV_CBITPOS=51
 MANAGER_QEMU_SEV_REDUCED_PHYS_BITS=1
 MANAGER_QEMU_HOST_DATA=
-MANAGER_QEMU_TDX_ID=tdx0
-MANAGER_QEMU_QUOTE_GENERATION_PORT=4050
-MANAGER_QEMU_OVMF_FILE=/usr/share/ovmf/OVMF.fd
 MANAGER_QEMU_VSOCK_ID=vhost-vsock-pci0
 MANAGER_QEMU_VSOCK_GUEST_CID=3
 MANAGER_QEMU_VSOCK_VNC=0
@@ -54,14 +49,13 @@ MANAGER_QEMU_BIN_PATH=qemu-system-x86_64
 MANAGER_QEMU_USE_SUDO=true
 MANAGER_QEMU_ENABLE_SEV=false
 MANAGER_QEMU_ENABLE_SEV_SNP=false
-MANAGER_QEMU_ENABLE_TDX=false
-MANAGER_QEMU_IGVM_FILE=/etc/cocos/coconut-qemu.igvm
 MANAGER_QEMU_ENABLE_KVM=true
 MANAGER_QEMU_MACHINE=q35
 MANAGER_QEMU_CPU=EPYC
 MANAGER_QEMU_SMP_COUNT=4
 MANAGER_QEMU_SMP_MAXCPUS=16
 MANAGER_QEMU_MEM_ID=ram1
+MANAGER_QEMU_KERNEL_HASH=false
 MANAGER_QEMU_NO_GRAPHIC=true
 MANAGER_QEMU_MONITOR=pty
 MANAGER_QEMU_HOST_FWD_RANGE=6100-6200

go.mod

@@ -1,8 +1,6 @@
 module github.com/ultravioletrs/cocos
 
-go 1.23.2
-
-toolchain go1.24.1
+go 1.23.0
 
 require (
 	github.com/absmach/magistrala v0.15.1
@@ -10,62 +8,31 @@ require (
 	github.com/fatih/color v1.18.0
 	github.com/go-kit/kit v0.13.0
 	github.com/gofrs/uuid v4.4.0+incompatible
-	github.com/google/go-sev-guest v0.13.0
-	github.com/google/go-tdx-guest v0.3.2-0.20241009005452-097ee70d0843 // indirect
+	github.com/google/go-sev-guest v0.11.1
 	github.com/mdlayher/vsock v1.2.1
-	github.com/spf13/cobra v1.9.1
+	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.6
 	github.com/stretchr/testify v1.10.0
 	github.com/virtee/sev-snp-measure-go v0.0.0-20240530153610-e6e8dc9b6877
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0
-	go.opentelemetry.io/otel/trace v1.36.0
-	golang.org/x/crypto v0.38.0
-	golang.org/x/sync v0.14.0
-	google.golang.org/grpc v1.72.1
-	google.golang.org/protobuf v1.36.6
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0
+	go.opentelemetry.io/otel/trace v1.34.0
+	golang.org/x/crypto v0.32.0
+	golang.org/x/sync v0.10.0
+	google.golang.org/grpc v1.69.4
+	google.golang.org/protobuf v1.36.3
 )
 
 require (
-	cloud.google.com/go/storage v1.51.0
-	github.com/caarlos0/env/v10 v10.0.0
-	github.com/golang-jwt/jwt/v5 v5.2.2
-	github.com/google/gce-tcb-verifier v0.3.1
-)
-
-require (
-	cel.dev/expr v0.20.0 // indirect
-	cloud.google.com/go v0.118.3 // indirect
-	cloud.google.com/go/auth v0.15.0 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
-	cloud.google.com/go/compute/metadata v0.6.0 // indirect
-	cloud.google.com/go/iam v1.4.1 // indirect
-	cloud.google.com/go/monitoring v1.24.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
-	github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
-	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/go-jose/go-jose/v3 v3.0.3 // indirect
-	github.com/go-jose/go-jose/v4 v4.0.4 // indirect
 	github.com/gofrs/uuid/v5 v5.3.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/google/certificate-transparency-go v1.1.8 // indirect
-	github.com/google/go-attestation v0.5.1 // indirect
-	github.com/google/go-eventlog v0.0.2-0.20241003021507-01bb555f7cba // indirect
-	github.com/google/go-tspi v0.3.0 // indirect
-	github.com/google/s2a-go v0.1.9 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.5 // indirect
-	github.com/googleapis/gax-go/v2 v2.14.1 // indirect
-	github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
@@ -73,66 +40,48 @@ require (
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
-	github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
-	github.com/zeebo/errs v1.4.0 // indirect
+	github.com/pborman/uuid v1.2.1 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
-	go.opentelemetry.io/otel v1.36.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.35.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
-	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
-	golang.org/x/oauth2 v0.28.0 // indirect
-	golang.org/x/time v0.10.0 // indirect
-	google.golang.org/api v0.224.0 // indirect
-	google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
+	go.opentelemetry.io/otel v1.34.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.32.0 // indirect
 	gotest.tools/v3 v3.5.1 // indirect
-	moul.io/http2curl v1.0.0 // indirect
 )
 
 require (
-	github.com/absmach/certs v0.0.0-20250313105043-afbcda9a9963
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/docker/docker v28.0.4+incompatible
-	github.com/edgelesssys/go-azguestattestation v0.0.0-20250408071817-8c4457b235ff
+	github.com/docker/docker v27.5.1+incompatible
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/google/go-configfs-tsm v0.3.3-0.20240919001351-b4b5b84fdcbc // indirect
-	github.com/google/go-tpm v0.9.3
-	github.com/google/go-tpm-tools v0.4.4
+	github.com/google/go-configfs-tsm v0.2.2 // indirect
 	github.com/google/logger v1.1.1
 	github.com/google/uuid v1.6.0
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/mdlayher/socket v0.4.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_golang v1.21.1 // indirect
+	github.com/prometheus/client_golang v1.20.5 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.62.0 // indirect
+	github.com/prometheus/common v0.59.1 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
-	go.opentelemetry.io/otel/metric v1.36.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
+	go.opentelemetry.io/otel/metric v1.34.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/net v0.35.0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/term v0.32.0
-	golang.org/x/text v0.25.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
+	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/term v0.28.0
+	golang.org/x/text v0.21.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 replace github.com/virtee/sev-snp-measure-go => github.com/sammyoina/sev-snp-measure-go v0.0.0-20241202151803-ef189f0ff825
-
-replace github.com/google/go-tpm-tools => github.com/danko-miladinovic/go-tpm-tools v0.0.0-20250228160324-1ebcfd79567c

go.sum

@@ -1,91 +1,36 @@
-cel.dev/expr v0.20.0 h1:OunBvVCfvpWlt4dN7zg3FM6TDkzOePe1+foGJ9AXeeI=
-cel.dev/expr v0.20.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
-cloud.google.com/go v0.118.3 h1:jsypSnrE/w4mJysioGdMBg4MiW/hHx/sArFpaBWHdME=
-cloud.google.com/go v0.118.3/go.mod h1:Lhs3YLnBlwJ4KA6nuObNMZ/fCbOQBPuWKPoE0Wa/9Vc=
-cloud.google.com/go/auth v0.15.0 h1:Ly0u4aA5vG/fsSsxu98qCQBemXtAtJf+95z9HK+cxps=
-cloud.google.com/go/auth v0.15.0/go.mod h1:WJDGqZ1o9E9wKIL+IwStfyn/+s59zl4Bi+1KQNVXLZ8=
-cloud.google.com/go/auth/oauth2adapt v0.2.7 h1:/Lc7xODdqcEw8IrZ9SvwnlLX6j9FHQM74z6cBk9Rw6M=
-cloud.google.com/go/auth/oauth2adapt v0.2.7/go.mod h1:NTbTTzfvPl1Y3V1nPpOgl2w6d/FjO7NNUQaWSox6ZMc=
-cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=
-cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=
-cloud.google.com/go/iam v1.4.1 h1:cFC25Nv+u5BkTR/BT1tXdoF2daiVbZ1RLx2eqfQ9RMM=
-cloud.google.com/go/iam v1.4.1/go.mod h1:2vUEJpUG3Q9p2UdsyksaKpDzlwOrnMzS30isdReIcLM=
-cloud.google.com/go/logging v1.13.0 h1:7j0HgAp0B94o1YRDqiqm26w4q1rDMH7XNRU34lJXHYc=
-cloud.google.com/go/logging v1.13.0/go.mod h1:36CoKh6KA/M0PbhPKMq6/qety2DCAErbhXT62TuXALA=
-cloud.google.com/go/longrunning v0.6.5 h1:sD+t8DO8j4HKW4QfouCklg7ZC1qC4uzVZt8iz3uTW+Q=
-cloud.google.com/go/longrunning v0.6.5/go.mod h1:Et04XK+0TTLKa5IPYryKf5DkpwImy6TluQ1QTLwlKmY=
-cloud.google.com/go/monitoring v1.24.0 h1:csSKiCJ+WVRgNkRzzz3BPoGjFhjPY23ZTcaenToJxMM=
-cloud.google.com/go/monitoring v1.24.0/go.mod h1:Bd1PRK5bmQBQNnuGwHBfUamAV1ys9049oEPHnn4pcsc=
-cloud.google.com/go/storage v1.51.0 h1:ZVZ11zCiD7b3k+cH5lQs/qcNaoSz3U9I0jgwVzqDlCw=
-cloud.google.com/go/storage v1.51.0/go.mod h1:YEJfu/Ki3i5oHC/7jyTgsGZwdQ8P9hqMqvpi5kRKGgc=
-cloud.google.com/go/trace v1.11.3 h1:c+I4YFjxRQjvAhRmSsmjpASUKq88chOX854ied0K/pE=
-cloud.google.com/go/trace v1.11.3/go.mod h1:pt7zCYiDSQjC9Y2oqCsh9jF4GStB/hmjrYLsxRR27q8=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0=
 github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 h1:f2Qw/Ehhimh5uO1fayV0QIW7DShEQqhtUfhYc+cBPlw=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0/go.mod h1:2bIszWvQRlJVmJLiuLhukLImRjKPcYdzzsx6darK02A=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 h1:fYE9p3esPxA/C0rQ0AHhP0drtPXDRhaWiwg1DPqO7IU=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0/go.mod h1:BnBReJLvVYx2CS/UHOgVz2BXKXD9wsQPxZug20nZhd0=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.51.0 h1:OqVGm6Ei3x5+yZmSJG1Mh2NwHvpVmZ08CB5qJhT9Nuk=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.51.0/go.mod h1:SZiPHWGOOk3bl8tkevxkoiwPgsIl6CwrWcbwjfHZpdM=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 h1:6/0iUd0xrnX7qt+mLNRwg5c0PGv8wpE8K90ryANQwMI=
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0/go.mod h1:otE2jQekW/PqXk1Awf5lmfokJx4uwuqcj1ab5SpGeW0=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
 github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
-github.com/absmach/certs v0.0.0-20250313105043-afbcda9a9963 h1:kN6NwYWNyTMAmDAwAGuxVYw6t8TL50CB6Kw3jOHj6iw=
-github.com/absmach/certs v0.0.0-20250313105043-afbcda9a9963/go.mod h1:I4SywlzOXtUfJwVHCyPOUdl8rEsby2cJX2mqA5A4MOw=
 github.com/absmach/magistrala v0.15.1 h1:3Bk2hlyWcV591LxPYwlvRcyCXTfuZ1g/EkNmU+o3NNQ=
 github.com/absmach/magistrala v0.15.1/go.mod h1:9pto6xuBt/IuCtZRdEha0iDQKNQ5tyNOjLXJgUiikYk=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/caarlos0/env/v10 v10.0.0 h1:yIHUBZGsyqCnpTkbjk8asUlx6RFhhEs+h7TOBdgdzXA=
-github.com/caarlos0/env/v10 v10.0.0/go.mod h1:ZfulV76NvVPw3tm591U4SwL3Xx9ldzBP9aGxzeN7G18=
 github.com/caarlos0/env/v11 v11.3.1 h1:cArPWC15hWmEt+gWk7YBi7lEXTXCvpaSdCiZE2X5mCA=
 github.com/caarlos0/env/v11 v11.3.1/go.mod h1:qupehSf/Y0TUTsxKywqRt/vJjN5nz6vauiYEUUr8P4U=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 h1:Om6kYQYDUk5wWbT0t0q6pvyM49i9XZAv9dDrkDA7gjk=
-github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
-github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
-github.com/danko-miladinovic/go-tpm-tools v0.0.0-20250228160324-1ebcfd79567c h1:gFo8kqRXFoM6ttqMrK+M3xffxco+Yj80kUo3NoMe8LU=
-github.com/danko-miladinovic/go-tpm-tools v0.0.0-20250228160324-1ebcfd79567c/go.mod h1:ktjTNq8yZFD6TzdBFefUfen96rF3NpYwpSb2d8bc+Y8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v28.0.4+incompatible h1:JNNkBctYKurkw6FrHfKqY0nKIDf5nrbxjVBtS+cdcok=
-github.com/docker/docker v28.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQAIfE8q4YnPY8=
+github.com/docker/docker v27.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/edgelesssys/go-azguestattestation v0.0.0-20250408071817-8c4457b235ff h1:V6A5kD0+c1Qg4X72Lg+zxhCZk+par436sQdgLvMCBBc=
-github.com/edgelesssys/go-azguestattestation v0.0.0-20250408071817-8c4457b235ff/go.mod h1:Lz4QaomI4wU2YbatD4/W7vatW2Q35tnkoJezB1clscc=
-github.com/envoyproxy/go-control-plane v0.13.4 h1:zEqyPVyku6IvWCFwux4x9RxkLOMUL+1vC9xUFv5l2/M=
-github.com/envoyproxy/go-control-plane v0.13.4/go.mod h1:kDfuBlDVsSj2MjrLEtRWtHlsWIFcGyB2RMO44Dc5GZA=
-github.com/envoyproxy/go-control-plane/envoy v1.32.4 h1:jb83lalDRZSpPWW2Z7Mck/8kXZ5CQAFYVjQcdVIr83A=
-github.com/envoyproxy/go-control-plane/envoy v1.32.4/go.mod h1:Gzjc5k8JcJswLjAx1Zm+wSYE20UrLtt7JZMWiWQXQEw=
-github.com/envoyproxy/go-control-plane/ratelimit v0.1.0 h1:/G9QYbddjL25KvtKTv3an9lx6VBE2cnb8wp1vEGNYGI=
-github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4=
-github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfUKS7KJ7spH3d86P8=
-github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU=
 github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8=
-github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
-github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k=
-github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
-github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E=
-github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc=
 github.com/go-kit/kit v0.13.0 h1:OoneCcHKHQ03LfBpoQCUfCluwd2Vt3ohz+kvbJneZAU=
 github.com/go-kit/kit v0.13.0/go.mod h1:phqEHMMUbyrCFCTgH48JueqrM3md2HcAZ8N3XE4FKDg=
 github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
@@ -103,60 +48,27 @@ github.com/gofrs/uuid/v5 v5.3.0 h1:m0mUMr+oVYUdxpMLgSYCZiXe7PuVPnI94+OMeVBNedk=
 github.com/gofrs/uuid/v5 v5.3.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
-github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
-github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
-github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=
-github.com/google/certificate-transparency-go v1.1.8 h1:LGYKkgZF7satzgTak9R4yzfJXEeYVAjV6/EAEJOf1to=
-github.com/google/certificate-transparency-go v1.1.8/go.mod h1:bV/o8r0TBKRf1X//iiiSgWrvII4d7/8OiA+3vG26gI8=
-github.com/google/gce-tcb-verifier v0.3.1 h1:4L9YgkOtqC2U7cj4FofCUufHFCCpdD4Y0yPKI8UhOhI=
-github.com/google/gce-tcb-verifier v0.3.1/go.mod h1:GZCDLQxmEOCqUTL2BMB/zjo+hgXdUrR0Wgwz1OrwRYg=
-github.com/google/go-attestation v0.5.1 h1:jqtOrLk5MNdliTKjPbIPrAaRKJaKW+0LIU2n/brJYms=
-github.com/google/go-attestation v0.5.1/go.mod h1:KqGatdUhg5kPFkokyzSBDxwSCFyRgIgtRkMp6c3lOBQ=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/go-configfs-tsm v0.3.3-0.20240919001351-b4b5b84fdcbc h1:SG12DWUUM5igxm+//YX5Yq4vhdoRnOG9HkCodkOn+YU=
-github.com/google/go-configfs-tsm v0.3.3-0.20240919001351-b4b5b84fdcbc/go.mod h1:EL1GTDFMb5PZQWDviGfZV9n87WeGTR/JUg13RfwkgRo=
-github.com/google/go-eventlog v0.0.2-0.20241003021507-01bb555f7cba h1:05m5+kgZjxYUZrx3bZfkKHl6wkch+Khao6N21rFHInk=
-github.com/google/go-eventlog v0.0.2-0.20241003021507-01bb555f7cba/go.mod h1:7huE5P8w2NTObSwSJjboHmB7ioBNblkijdzoVa2skfQ=
-github.com/google/go-sev-guest v0.13.0 h1:DJB6ACdykyweMU0HGOp/TQ7cjsnbV2ecbYunu2E0qy0=
-github.com/google/go-sev-guest v0.13.0/go.mod h1:SK9vW+uyfuzYdVN0m8BShL3OQCtXZe/JPF7ZkpD3760=
-github.com/google/go-tdx-guest v0.3.2-0.20241009005452-097ee70d0843 h1:+MoPobRN9HrDhGyn6HnF5NYo4uMBKaiFqAtf/D/OB4A=
-github.com/google/go-tdx-guest v0.3.2-0.20241009005452-097ee70d0843/go.mod h1:g/n8sKITIT9xRivBUbizo34DTsUm2nN2uU3A662h09g=
-github.com/google/go-tpm v0.9.3 h1:+yx0/anQuGzi+ssRqeD6WpXjW2L/V0dItUayO0i9sRc=
-github.com/google/go-tpm v0.9.3/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
-github.com/google/go-tspi v0.3.0 h1:ADtq8RKfP+jrTyIWIZDIYcKOMecRqNJFOew2IT0Inus=
-github.com/google/go-tspi v0.3.0/go.mod h1:xfMGI3G0PhxCdNVcYr1C4C+EizojDg/TXuX5by8CiHI=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-configfs-tsm v0.2.2 h1:YnJ9rXIOj5BYD7/0DNnzs8AOp7UcvjfTvt215EWcs98=
+github.com/google/go-configfs-tsm v0.2.2/go.mod h1:EL1GTDFMb5PZQWDviGfZV9n87WeGTR/JUg13RfwkgRo=
+github.com/google/go-sev-guest v0.11.1 h1:gnww4U8fHV5DCPz4gykr1s8SEX1fFNcxCBy+vvXN24k=
+github.com/google/go-sev-guest v0.11.1/go.mod h1:qBOfb+JmgsUI3aUyzQoGC13Kpp9zwLeWvuyXmA9q77w=
 github.com/google/logger v1.1.1 h1:+6Z2geNxc9G+4D4oDO9njjjn2d0wN5d7uOo0vOIW1NQ=
 github.com/google/logger v1.1.1/go.mod h1:BkeJZ+1FhQ+/d087r4dzojEg1u2ZX+ZqG1jTUrLM+zQ=
-github.com/google/martian/v3 v3.3.3 h1:DIhPTQrbPkgs2yJYdXU/eNACCG5DVQjySNRNlflZ9Fc=
-github.com/google/martian/v3 v3.3.3/go.mod h1:iEPrYcgCF7jA9OtScMFQyAlZZ4YXTKEtJ1E6RWzmBA0=
-github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
-github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.3.5 h1:VgzTY2jogw3xt39CusEnFJWm7rlsq5yL5q9XdLOuP5g=
-github.com/googleapis/enterprise-certificate-proxy v0.3.5/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
-github.com/googleapis/gax-go/v2 v2.14.1 h1:hb0FFeiPaQskmvakKu5EbCbpntQn48jyHuvrkurSS/Q=
-github.com/googleapis/gax-go/v2 v2.14.1/go.mod h1:Hb/NubMaVM88SrNkvl8X/o8XWwDJEPqouaLeN2IUxoA=
-github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
-github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 h1:e9Rjr40Z98/clHv5Yg79Is0NtosR5LXRvdr7o/6NwbA=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1/go.mod h1:tIxuGz/9mpox++sgp9fJjHO0+q1X9/UOWd798aAm22M=
-github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f h1:7LYC+Yfkj3CTRcShK0KOL/w6iTiKyqqBA9a41Wnggw8=
-github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f/go.mod h1:pFlLw2CfqZiIBOx6BuCeRLCrfxBJipTY0nIOF/VbGcI=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 h1:ad0vkEBuk23VJzZR9nkLVG0YAoN9coASF1GusYX6AlU=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0/go.mod h1:igFoXX2ELCW06bol23DWPB5BEWfZISOzSP5K2sbLea0=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -182,21 +94,18 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
 github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
-github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
-github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw=
+github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
-github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
-github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
+github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
+github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
-github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
+github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJoX0=
+github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0=
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
@@ -206,152 +115,95 @@ github.com/sammyoina/sev-snp-measure-go v0.0.0-20241202151803-ef189f0ff825 h1:Sq
 github.com/sammyoina/sev-snp-measure-go v0.0.0-20241202151803-ef189f0ff825/go.mod h1:dEkBe8JnxU5itNjZDEQINFd7f7l4DtjfqRuzPQcit4w=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/smarty/assertions v1.15.0 h1:cR//PqUBUiQRakZWqBiFFQ9wb8emQGDb0HeGdqGByCY=
-github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec=
-github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sSznIX1xY=
-github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60=
-github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
-github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
+github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
+github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spiffe/go-spiffe/v2 v2.5.0 h1:N2I01KCUkv1FAjZXJMwh95KK1ZIQLYbPfhaxw8WS0hE=
-github.com/spiffe/go-spiffe/v2 v2.5.0/go.mod h1:P+NxobPc6wXhVtINNtFjNWGBTreew1GBUCwT2wPmb7g=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/zeebo/errs v1.4.0 h1:XNdoD/RRMKP7HD0UhJnIzUy74ISdGGxURlYG8HSWSfM=
-github.com/zeebo/errs v1.4.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/contrib/detectors/gcp v1.34.0 h1:JRxssobiPg23otYU5SbWtQC//snGVIM3Tx6QRzlQBao=
-go.opentelemetry.io/contrib/detectors/gcp v1.34.0/go.mod h1:cV4BMFcscUR/ckqLkbfQmF0PRsq8w/lMGzdbCSveBHo=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 h1:x7wzEgXfnzJcHDwStJT+mxOz4etr2EcexjqhBvmoakw=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0/go.mod h1:rg+RlpR5dKwaS95IyyZqj5Wd4E13lk/msnTS0Xl9lJM=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
-go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
-go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 h1:OeNbIYk/2C15ckl7glBlOBp5+WlYsOElzTNmiPW/x60=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0/go.mod h1:7Bept48yIeqxP2OZ9/AqIpYS94h2or0aB4FypJTc8ZM=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 h1:BEj3SPM81McUZHYjRS5pEgNgnmzGJ5tRpU5krWnV8Bs=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0/go.mod h1:9cKLGBDzI/F3NoHLQGm4ZrYdIHsvGt6ej6hUowxY0J4=
-go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0 h1:WDdP9acbMYjbKIyJUhTvtzj601sVJOqgWdUxSdR/Ysc=
-go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.29.0/go.mod h1:BLbf7zbNIONBLPwvFnwNHGj4zge8uTCM/UPIVW1Mq2I=
-go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
-go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
-go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY=
-go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg=
-go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o=
-go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w=
-go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
-go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
-go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
-go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
-go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
-go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 h1:rgMkmiGfix9vFJDcDi1PK8WEQP4FLQwLDfhp5ZLpFeE=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0/go.mod h1:ijPqXp5P6IRRByFVVg9DY8P5HkxkHE5ARIa+86aXPf4=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 h1:DheMAlT6POBP+gh8RUH19EOTnQIor5QE0uSRPtzCpSw=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0/go.mod h1:wZcGmeVO9nzP67aYSLDqXNWK87EZWhi7JWj1v7ZXf94=
+go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
+go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 h1:IJFEoHiytixx8cMiVAO+GmHR6Frwu+u5Ur8njpFO6Ac=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0/go.mod h1:3rHrKNtLIoS0oZwkY2vxi+oJcwFRWdtUyRII+so45p8=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 h1:cMyu9O88joYEaI47CnQkxO1XZdpoTF9fEnW2duIddhw=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0/go.mod h1:6Am3rn7P9TVVeXYG+wtcGE7IE1tsQ+bP3AuWcKt/gOI=
+go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
+go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
+go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
+go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU=
+go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc=
+go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8=
+go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
+go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
+go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0=
+go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
-golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
-golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
-golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
-golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
-golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc=
-golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
-golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
-golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
-golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
-golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
-golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
+golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.224.0 h1:Ir4UPtDsNiwIOHdExr3fAj4xZ42QjK7uQte3lORLJwU=
-google.golang.org/api v0.224.0/go.mod h1:3V39my2xAGkodXy0vEqcEtkqgw2GtrFL5WuBZlCTCOQ=
-google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb h1:ITgPrl429bc6+2ZraNSzMDk3I95nmQln2fuPstKwFDE=
-google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:sAo5UzpjUwgFBCzupwhcLcxHVDK7vG5IqI30YnwX2eE=
-google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb h1:p31xT4yrYrSM/G4Sn2+TNUkVhFCbG9y8itM2S6Th950=
-google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:jbe3Bkdp+Dh2IrslsFCklNhweNTBgSYanP1UXhJDhKg=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb h1:TLPQVbx1GJ8VKZxz52VAxl1EBgKXXbTiU9Fc5fZeLn4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
-google.golang.org/grpc v1.72.1 h1:HR03wO6eyZ7lknl75XlxABNVLLFc2PAb6mHlYh756mA=
-google.golang.org/grpc v1.72.1/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
-google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
-google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
+google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g=
+google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
+google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A=
+google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
+google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
+google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
 gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
-moul.io/http2curl v1.0.0 h1:6XwpyZOYsgZJrU8exnG87ncVkU1FVCcTRpwzOkTDUi8=
-moul.io/http2curl v1.0.0/go.mod h1:f6cULg+e4Md/oW1cYmwW4IWQOVl2lGbmCNGOHvzX2kE=

hal/cloud/config.yaml

@@ -11,16 +11,14 @@ users:
       - docker # Add cocos user to the docker group
     sudo:
       - ALL=(ALL:ALL) ALL
-    shell: /sbin/nologin
-  - name: algo_user
-    gecos: Algorithm User
-    groups:
-      - docker # Add to docker group for container execution
     shell: /bin/bash
-    sudo:
-      - /usr/bin/python3 # Allow running Python
-      - /home/algo_user/.wasmtime/bin/wasmtime # Allow running Wasmtime
-      - /usr/bin/docker # Allow running Docker commands
+
+chpasswd:
+  list: |
+    cocos_user:password
+  expire: False
+
+ssh_pwauth: True
 
 packages:
   - curl
@@ -29,8 +27,6 @@ packages:
   - python3
   - python3-dev
   - net-tools # Add net-tools to install the 'route' command
-  - iptables-persistent # Add iptables-persistent to save firewall rules
-  - sudo # Ensure sudo is installed
 
 write_files:
   - path: /etc/cocos/certs/cert.pem
@@ -138,134 +134,7 @@ write_files:
       exec /bin/cocos-agent
     permissions: "0755"
 
-  # Firewall configuration script
-  - path: /cocos_init/setup_firewall.sh
-    content: |
-      #!/bin/bash
-      
-      # Flush existing rules
-      iptables -F
-      iptables -X
-      iptables -t nat -F
-      iptables -t nat -X
-      iptables -t mangle -F
-      iptables -t mangle -X
-      
-      # Set default policies to DROP
-      iptables -P INPUT DROP
-      iptables -P FORWARD DROP
-      iptables -P OUTPUT ACCEPT
-      
-      # Allow loopback interface
-      iptables -A INPUT -i lo -j ACCEPT
-      iptables -A OUTPUT -o lo -j ACCEPT
-      
-      # Allow established and related connections
-      iptables -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT
-      
-      # Allow port 7002 (TCP) for incoming connections
-      iptables -A INPUT -p tcp --dport 7002 -j ACCEPT
-      
-      # Save rules to persist after reboot
-      mkdir -p /etc/iptables
-      iptables-save > /etc/iptables/rules.v4
-      
-      echo "Firewall configured to allow only port 7002"
-    permissions: "0755"
-
-  # Setup script for algo_user
-  - path: /cocos_init/setup_algo_user.sh
-    content: |
-      #!/bin/bash
-      
-      # Create datasets directory with the right permissions
-      mkdir -p /datasets
-      chown root:root /datasets
-      chmod 755 /datasets
-      
-      # Create a home directory for algo_user
-      mkdir -p /home/algo_user
-      chown algo_user:algo_user /home/algo_user
-      chmod 750 /home/algo_user
-      
-      # Set up Wasmtime for algo_user
-      mkdir -p /home/algo_user/.wasmtime/bin
-      
-      # Link system Wasmtime to user's directory
-      ln -s /root/.wasmtime/bin/wasmtime /home/algo_user/.wasmtime/bin/wasmtime
-      chown -R algo_user:algo_user /home/algo_user/.wasmtime
-      
-      # Configure sudoers for algo_user
-      cat > /etc/sudoers.d/algo_user << EOF
-      algo_user ALL=(ALL) NOPASSWD: /usr/bin/python3
-      algo_user ALL=(ALL) NOPASSWD: /home/algo_user/.wasmtime/bin/wasmtime
-      algo_user ALL=(ALL) NOPASSWD: /usr/bin/docker
-      Defaults:algo_user !requiretty
-      EOF
-      
-      chmod 440 /etc/sudoers.d/algo_user
-      
-      # Create a .bashrc file that restricts navigation to /datasets
-      cat > /home/algo_user/.bashrc << EOF
-      # .bashrc for algo_user
-      
-      # Restrict navigation outside /datasets
-      function cd() {
-          if [[ "\$1" == /* && "\$1" != "/datasets"* && "\$1" != "/home/algo_user"* ]]; then
-              echo "Access denied: You can only access files in /datasets or your home directory"
-              return 1
-          else
-              builtin cd "\$1"
-          fi
-      }
-      
-      # Set PATH to include necessary binaries
-      export PATH=/usr/bin:/bin:/usr/local/bin:/home/algo_user/.wasmtime/bin
-      
-      # Set default directory
-      if [[ \$PWD != "/datasets"* && \$PWD != "/home/algo_user"* ]]; then
-          cd /datasets
-      fi
-      EOF
-      
-      chown algo_user:algo_user /home/algo_user/.bashrc
-      chmod 644 /home/algo_user/.bashrc
-      
-      echo "algo_user setup completed successfully"
-    permissions: "0755"
-    
-  # IMA setup for first boot
-  - path: /cocos_init/linux_ima_init.sh
-    content: |
-      #!/bin/bash
-      
-      GRUB_FILE="/etc/default/grub"
-      
-      if ! grep -q '^GRUB_CMDLINE_LINUX=.*ima_policy' "$GRUB_FILE"; then
-        echo "First boot, rebooting with fix IMA appraise policy"
-
-        NEW_PARAMS='ima_policy=tcb'
-        
-        # Modify the GRUB_CMDLINE_LINUX line
-        sed -i -E \
-            "s#^(GRUB_CMDLINE_LINUX=\")(.*)(\")#\1\2 $NEW_PARAMS\3#" \
-            "$GRUB_FILE"
-      
-        echo "Updated GRUB_CMDLINE_LINUX:"
-        grep "^GRUB_CMDLINE_LINUX=" "$GRUB_FILE"
-        
-        sudo update-grub
-        sudo reboot
-      else
-        sudo find / -fstype ext4 -type f -uid 0 -exec dd if='{}' of=/dev/null count=0 status=none \;
-      fi
-    permissions: "0755"
-
 runcmd:
-  # Enable Linux IMA with fix policy
-  - echo "Enable Linux IMA with fix policy and rebooting if necessary"
-  - sh /cocos_init/linux_ima_init.sh
-
   # Create necessary directories
   - mkdir -p /cocos
   - mkdir -p /cocos_init
@@ -294,41 +163,6 @@ runcmd:
   - sh ./get-docker.sh && echo "Docker installed successfully" || echo "Failed to install Docker"
   - usermod -aG docker cocos_user && echo "Added cocos_user to the docker group" || echo "Failed to add cocos_user to the docker group"
 
-  # Disable SSH service
-  - echo "Disabling SSH service..."
-  - systemctl disable ssh.service && echo "SSH service disabled successfully" || echo "Failed to disable SSH service"
-  - systemctl disable sshd.service && echo "SSHD service disabled successfully" || echo "Failed to disable SSHD service"
-  - systemctl stop ssh.service && echo "SSH service stopped successfully" || echo "Failed to stop SSH service"
-  - systemctl stop sshd.service && echo "SSHD service stopped successfully" || echo "Failed to stop SSHD service"
-
-  # Completely remove SSH server
-  - echo "Removing SSH server..."
-  - apt-get purge -y openssh-server && echo "SSH server removed successfully" || echo "Failed to remove SSH server"
-  - apt-get autoremove -y && echo "Removed dependencies successfully" || echo "Failed to remove dependencies"
-
-  # Set up firewall to only allow port 7002
-  - echo "Setting up firewall..."
-  - bash /cocos_init/setup_firewall.sh && echo "Firewall configured successfully" || echo "Failed to configure firewall"
-  
-  # Ensure iptables rules persist after reboot
-  - echo "Ensuring iptables rules persist after reboot..."
-  - systemctl enable netfilter-persistent && echo "netfilter-persistent service enabled successfully" || echo "Failed to enable netfilter-persistent service"
-  - systemctl start netfilter-persistent && echo "netfilter-persistent service started successfully" || echo "Failed to start netfilter-persistent service"
-
-  # Set up algo_user environment
-  - echo "Setting up algo_user environment..."
-  - bash /cocos_init/setup_algo_user.sh && echo "algo_user environment setup successfully" || echo "Failed to set up algo_user environment"
-  
-  # Create datasets directory and set permissions
-  - echo "Creating datasets directory..."
-  - mkdir -p /datasets && echo "datasets directory created successfully" || echo "Failed to create datasets directory"
-  - chown root:root /datasets && echo "datasets ownership set successfully" || echo "Failed to set datasets ownership"
-  - chmod 755 /datasets && echo "datasets permissions set successfully" || echo "Failed to set datasets permissions"
-  
-  # Add algo_user to the docker group
-  - echo "Adding algo_user to the docker group..."
-  - usermod -aG docker algo_user && echo "Added algo_user to the docker group" || echo "Failed to add algo_user to the docker group"
-
   # Reload systemd and enable the service
   - echo "[ COCOS AGENT SETUP ] Reloading systemd daemon..."
   - systemctl daemon-reload && echo "[ COCOS AGENT SETUP ] Systemd daemon reloaded successfully" || echo "[ COCOS AGENT SETUP ] Failed to reload systemd daemon"
@@ -337,4 +171,4 @@ runcmd:
   - echo "[ COCOS AGENT SETUP ] Starting cocos-agent.service..."
   - systemctl start cocos-agent.service && echo "[ COCOS AGENT SETUP ] cocos-agent.service started successfully" || echo "[ COCOS AGENT SETUP ] Failed to start cocos-agent.service"
 
-final_message: "Cocos agent and algo_user setup complete. Verify logs to confirm successful service startup."
+final_message: "Cocos agent setup complete. Verify logs to confirm successful service startup."

hal/cloud/qemu.sh

@@ -111,6 +111,7 @@ construct_qemu_args() {
     fi
 
     args+=("-monitor" "$MONITOR")
+    args+=("-no-reboot")
     args+=("-vnc" ":9")
 
     echo "${args[@]}"

hal/linux/README.md

@@ -10,7 +10,7 @@ HAL uses [Buildroot](https://buildroot.org/)'s [_External Tree_ mechanism](https
 git clone git@github.com:ultravioletrs/cocos.git
 git clone git@github.com:buildroot/buildroot.git
 cd buildroot
-git checkout 2025.05-rc1
+git checkout 2024.11-rc2
 make BR2_EXTERNAL=../cocos/hal/linux cocos_defconfig
 # Execute 'make menuconfig' only if you want to make additional configuration changes to Buildroot.
 make menuconfig

hal/linux/board/cocos/linux.config

@@ -76,36 +76,3 @@ CONFIG_9P_FS_SECURITY=y
 CONFIG_TCG_TPM=y
 CONFIG_TCG_TPM2_HMAC=y
 CONFIG_TCG_PLATFORM=y
-
-# Linux IMA
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_INTEGRITY=y
-CONFIG_INTEGRITY_SIGNATURE=y
-CONFIG_IMA=y
-CONFIG_IMA_MEASURE_PCR_IDX=10   # optional but good
-CONFIG_IMA_LSM_RULES=y
-CONFIG_IMA_APPRAISE=y           # if you want appraisal (signature checking)
-CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"
-CONFIG_KEYS=y
-CONFIG_ENCRYPTED_KEYS=y          # if you plan to use encrypted keys
-CONFIG_IMA_DEFAULT_HASH="sha256" # or sha1 if you prefer
-
-#Intel TDX
-CONFIG_EXPERT=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=y
-CONFIG_KVM_SW_PROTECTED_VM=y
-CONFIG_KVM_INTEL=y
-CONFIG_PCI_MSI=y
-CONFIG_IRQ_REMAP=y
-CONFIG_X86_X2APIC=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_X86_SGX=y
-CONFIG_X86_SGX_KVM=y
-CONFIG_INTEL_TDX_GUEST=y
-CONFIG_KSM=n
-CONFIG_EISA=n
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_NET=y
-CONFIG_TDX_GUEST_DRIVER=y

hal/linux/configs/cocos_defconfig

@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)"
 # Linux headers same as kernel
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y
 BR2_TOOLCHAIN_HEADERS_LATEST=y
-BR2_TOOLCHAIN_HEADERS_AT_LEAST="6.11-rc7"
+BR2_TOOLCHAIN_HEADERS_AT_LEAST="6.12-rc6"
 
 # Kernel
 BR2_LINUX_KERNEL=y

init/systemd/cocos-agent.service

@@ -7,11 +7,11 @@ Before=docker.service
 WorkingDirectory=/cocos
 StandardOutput=file:/var/log/cocos/agent.stdout
 StandardError=file:/var/log/cocos/agent.stderr
+
 EnvironmentFile=/etc/cocos/environment
+
 ExecStartPre=/cocos_init/agent_setup.sh
 ExecStart=/cocos_init/agent_start_script.sh
-Restart=always
-RestartSec=5s
 
 [Install]
 WantedBy=default.target

internal/server/grpc/grpc.go

@@ -4,7 +4,6 @@
 package grpc
 
 import (
-	"bytes"
 	"context"
 	"crypto/ecdsa"
 	"crypto/elliptic"
@@ -12,28 +11,20 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"crypto/x509/pkix"
-	"encoding/json"
 	"encoding/pem"
 	"fmt"
-	"io"
 	"log/slog"
 	"math/big"
 	"net"
-	"net/http"
-	"net/url"
 	"os"
 	"strings"
 	"time"
 
-	certs "github.com/absmach/certs"
-	certscli "github.com/absmach/certs/cli"
-	"github.com/absmach/certs/errors"
-	certssdk "github.com/absmach/certs/sdk"
+	"github.com/google/go-sev-guest/client"
 	agentgrpc "github.com/ultravioletrs/cocos/agent/api/grpc"
 	"github.com/ultravioletrs/cocos/agent/auth"
 	"github.com/ultravioletrs/cocos/internal/server"
 	"github.com/ultravioletrs/cocos/pkg/atls"
-	"github.com/ultravioletrs/cocos/pkg/attestation/vtpm"
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
@@ -60,21 +51,16 @@ type Server struct {
 	server.BaseServer
 	server          *grpc.Server
 	registerService serviceRegister
+	quoteProvider   client.QuoteProvider
 	authSvc         auth.Authenticator
 	health          *health.Server
-	caUrl           string
-	cvmId           string
-}
-
-type csrReq struct {
-	CSR string `json:"csr,omitempty"`
 }
 
 type serviceRegister func(srv *grpc.Server)
 
 var _ server.Server = (*Server)(nil)
 
-func New(ctx context.Context, cancel context.CancelFunc, name string, config server.ServerConfiguration, registerService serviceRegister, logger *slog.Logger, authSvc auth.Authenticator, caUrl string, cvmId string) server.Server {
+func New(ctx context.Context, cancel context.CancelFunc, name string, config server.ServerConfiguration, registerService serviceRegister, logger *slog.Logger, qp client.QuoteProvider, authSvc auth.Authenticator) server.Server {
 	base := config.GetBaseConfig()
 	listenFullAddress := fmt.Sprintf("%s:%s", base.Host, base.Port)
 	return &Server{
@@ -87,9 +73,8 @@ func New(ctx context.Context, cancel context.CancelFunc, name string, config ser
 			Logger:  logger,
 		},
 		registerService: registerService,
+		quoteProvider:   qp,
 		authSvc:         authSvc,
-		caUrl:           caUrl,
-		cvmId:           cvmId,
 	}
 }
 
@@ -108,9 +93,8 @@ func (s *Server) Start() error {
 	creds := grpc.Creds(insecure.NewCredentials())
 	var listener net.Listener
 
-	c := s.Config.GetBaseConfig()
 	if agCfg, ok := s.Config.(server.AgentConfig); ok && agCfg.AttestedTLS {
-		certificateBytes, privateKeyBytes, err := generateCertificatesForATLS(s.caUrl, s.cvmId)
+		certificateBytes, privateKeyBytes, err := generateCertificatesForATLS()
 		if err != nil {
 			return fmt.Errorf("failed to create certificate: %w", err)
 		}
@@ -125,41 +109,6 @@ func (s *Server) Start() error {
 			Certificates: []tls.Certificate{certificate},
 		}
 
-		var mtls bool
-		mtls = false
-
-		// Loading Server CA file
-		rootCA, err := loadCertFile(c.ServerCAFile)
-		if err != nil {
-			return fmt.Errorf("failed to load server ca file: %w", err)
-		}
-		if len(rootCA) > 0 {
-			if tlsConfig.RootCAs == nil {
-				tlsConfig.RootCAs = x509.NewCertPool()
-			}
-			if !tlsConfig.RootCAs.AppendCertsFromPEM(rootCA) {
-				return fmt.Errorf("failed to append server ca to tls.Config")
-			}
-			mtls = true
-		}
-
-		// Loading Client CA File
-		clientCA, err := loadCertFile(c.ClientCAFile)
-		if err != nil {
-			return fmt.Errorf("failed to load client ca file: %w", err)
-		}
-		if len(clientCA) > 0 {
-			if tlsConfig.ClientCAs == nil {
-				tlsConfig.ClientCAs = x509.NewCertPool()
-			}
-			if !tlsConfig.ClientCAs.AppendCertsFromPEM(clientCA) {
-				return fmt.Errorf("failed to append client ca to tls.Config")
-			}
-
-			tlsConfig.ClientAuth = tls.RequireAndVerifyClientCert
-			mtls = true
-		}
-
 		creds = grpc.Creds(credentials.NewTLS(tlsConfig))
 
 		listener, err = atls.Listen(
@@ -167,15 +116,12 @@ func (s *Server) Start() error {
 			certificateBytes,
 			privateKeyBytes,
 		)
-
 		if err != nil {
 			return fmt.Errorf("failed to create Listener for aTLS: %w", err)
-		} else if mtls {
-			s.Logger.Info(fmt.Sprintf("%s service gRPC server listening at %s with Attested mTLS", s.Name, s.Address))
-		} else {
-			s.Logger.Info(fmt.Sprintf("%s service gRPC server listening at %s with Attested TLS", s.Name, s.Address))
 		}
+		s.Logger.Info(fmt.Sprintf("%s service gRPC server listening at %s with Attested TLS", s.Name, s.Address))
 	} else {
+		c := s.Config.GetBaseConfig()
 		switch {
 		case c.CertFile != "" || c.KeyFile != "":
 			certificate, err := loadX509KeyPair(c.CertFile, c.KeyFile)
@@ -292,8 +238,6 @@ func readFileOrData(input string) ([]byte, error) {
 		data, err := os.ReadFile(input)
 		if err == nil {
 			return data, nil
-		} else {
-			return nil, err
 		}
 	}
 	return []byte(input), nil
@@ -313,99 +257,33 @@ func loadX509KeyPair(certfile, keyfile string) (tls.Certificate, error) {
 	return tls.X509KeyPair(cert, key)
 }
 
-func generateCertificatesForATLS(caUrl string, cvmId string) ([]byte, []byte, error) {
+func generateCertificatesForATLS() ([]byte, []byte, error) {
 	curve := elliptic.P256()
-
 	privateKey, err := ecdsa.GenerateKey(curve, rand.Reader)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to generate private/public key: %w", err)
 	}
 
-	var certDERBytes []byte
-
-	if caUrl == "" || cvmId == "" {
-		certTemplate := &x509.Certificate{
-			SerialNumber: big.NewInt(202403311),
-			Subject: pkix.Name{
-				Organization:  []string{organization},
-				Country:       []string{country},
-				Province:      []string{province},
-				Locality:      []string{locality},
-				StreetAddress: []string{streetAddress},
-				PostalCode:    []string{postalCode},
-			},
-			NotBefore:             time.Now(),
-			NotAfter:              time.Now().AddDate(notAfterYear, notAfterMonth, notAfterDay),
-			KeyUsage:              x509.KeyUsageDigitalSignature,
-			ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
-			BasicConstraintsValid: true,
-		}
-
-		DERBytes, err := x509.CreateCertificate(rand.Reader, certTemplate, certTemplate, &privateKey.PublicKey, privateKey)
-		if err != nil {
-			return nil, nil, fmt.Errorf("failed to create certificate: %w", err)
-		}
-
-		certDERBytes = DERBytes
-	} else {
-		csrmd := certs.CSRMetadata{
+	certTemplate := &x509.Certificate{
+		SerialNumber: big.NewInt(202403311),
+		Subject: pkix.Name{
 			Organization:  []string{organization},
 			Country:       []string{country},
 			Province:      []string{province},
 			Locality:      []string{locality},
 			StreetAddress: []string{streetAddress},
 			PostalCode:    []string{postalCode},
-		}
+		},
+		NotBefore:             time.Now(),
+		NotAfter:              time.Now().AddDate(notAfterYear, notAfterMonth, notAfterDay),
+		KeyUsage:              x509.KeyUsageDigitalSignature,
+		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
+		BasicConstraintsValid: true,
+	}
 
-		csr, err := certscli.CreateCSR(csrmd, privateKey)
-		if err != nil {
-			return nil, nil, fmt.Errorf("failed to create CSR: %w", err)
-		}
-
-		csrData := string(csr.CSR)
-
-		r := csrReq{
-			CSR: csrData,
-		}
-
-		data, error := json.Marshal(r)
-		if error != nil {
-			return nil, nil, errors.NewSDKError(error)
-		}
-
-		notBefore := time.Now()
-		notAfter := time.Now().AddDate(notAfterYear, notAfterMonth, notAfterDay)
-		ttlString := notAfter.Sub(notBefore).String()
-
-		query := url.Values{}
-		query.Add("ttl", ttlString)
-		query_string := query.Encode()
-
-		certsEndpoint := "certs"
-		csrEndpoint := "csrs"
-		endpoint := fmt.Sprintf("%s/%s/%s", certsEndpoint, csrEndpoint, cvmId)
-
-		url := fmt.Sprintf("%s/%s?%s", caUrl, endpoint, query_string)
-
-		_, body, sdkerr := processRequest(http.MethodPost, url, data, nil, http.StatusOK)
-		if sdkerr != nil {
-			return nil, nil, errors.NewSDKError(sdkerr)
-		}
-
-		var cert certssdk.Certificate
-		if err := json.Unmarshal(body, &cert); err != nil {
-			return nil, nil, errors.NewSDKError(err)
-		}
-
-		cleanCertificateString := strings.ReplaceAll(cert.Certificate, "\\n", "\n")
-
-		block, rest := pem.Decode([]byte(cleanCertificateString))
-
-		if len(rest) != 0 {
-			return nil, nil, fmt.Errorf("failed to convert generated certificate to DER format: %s", cleanCertificateString)
-		}
-
-		certDERBytes = block.Bytes
+	certDERBytes, err := x509.CreateCertificate(rand.Reader, certTemplate, certTemplate, &privateKey.PublicKey, privateKey)
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to create certificate: %w", err)
 	}
 
 	certBytes := pem.EncodeToMemory(&pem.Block{
@@ -423,57 +301,5 @@ func generateCertificatesForATLS(caUrl string, cvmId string) ([]byte, []byte, er
 		Bytes: privateKeyBytes,
 	})
 
-	cert, err := x509.ParseCertificate(certDERBytes)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to parse certificate: %w", err)
-	}
-
-	pubKeyDER, err := x509.MarshalPKIXPublicKey(cert.PublicKey)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to marshal public key to DER format: %w", err)
-	}
-
-	if err := vtpm.ExtendPCR(vtpm.PCR15, pubKeyDER); err != nil {
-		return nil, nil, fmt.Errorf("failed to extend vTPM PCR with public key: %w", err)
-	}
-
 	return certBytes, keyBytes, nil
 }
-
-func processRequest(method, reqUrl string, data []byte, headers map[string]string, expectedRespCodes ...int) (http.Header, []byte, errors.SDKError) {
-	req, err := http.NewRequest(method, reqUrl, bytes.NewReader(data))
-	if err != nil {
-		return make(http.Header), []byte{}, errors.NewSDKError(err)
-	}
-
-	// Sets a default value for the Content-Type.
-	// Overridden if Content-Type is passed in the headers arguments.
-	req.Header.Add("Content-Type", "application/json")
-
-	for key, value := range headers {
-		req.Header.Add(key, value)
-	}
-
-	client := &http.Client{
-		Transport: &http.Transport{
-			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: true,
-			},
-		},
-	}
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return make(http.Header), []byte{}, errors.NewSDKError(err)
-	}
-	defer resp.Body.Close()
-	sdkerr := errors.CheckError(resp, expectedRespCodes...)
-	if sdkerr != nil {
-		return make(http.Header), []byte{}, sdkerr
-	}
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return make(http.Header), []byte{}, errors.NewSDKError(err)
-	}
-	return resp.Header, body, nil
-}

internal/server/grpc/grpc_test.go

@@ -21,7 +21,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	authmocks "github.com/ultravioletrs/cocos/agent/auth/mocks"
 	"github.com/ultravioletrs/cocos/internal/server"
-	"github.com/ultravioletrs/cocos/pkg/attestation/vtpm"
+	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider/mocks"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/test/bufconn"
 )
@@ -30,28 +30,6 @@ const bufSize = 1024 * 1024
 
 var lis *bufconn.Listener
 
-type DummyRWC struct{}
-
-// Read fills p with byte(len(p)) and returns len(p).
-func (l *DummyRWC) Read(p []byte) (int, error) {
-	n := len(p)
-	// Fill each byte in p with the value of n as a byte.
-	for i := range p {
-		p[i] = byte(n)
-	}
-	return n, nil
-}
-
-// Write simply returns len(p) indicating that all bytes were written.
-func (l *DummyRWC) Write(p []byte) (int, error) {
-	// In this simple implementation, we ignore the data.
-	return len(p), nil
-}
-
-func (l *DummyRWC) Close() error {
-	return nil
-}
-
 func init() {
 	lis = bufconn.Listen(bufSize)
 }
@@ -69,9 +47,10 @@ func TestNew(t *testing.T) {
 		},
 	}
 	logger := slog.Default()
+	qp := new(mocks.QuoteProvider)
 	authSvc := new(authmocks.Authenticator)
 
-	srv := New(ctx, cancel, "TestServer", config, func(srv *grpc.Server) {}, logger, authSvc, "", "")
+	srv := New(ctx, cancel, "TestServer", config, func(srv *grpc.Server) {}, logger, qp, authSvc)
 
 	assert.NotNil(t, srv)
 	assert.IsType(t, &Server{}, srv)
@@ -118,9 +97,10 @@ func TestServerStartWithTLSFile(t *testing.T) {
 
 	logBuffer := &ThreadSafeBuffer{}
 	logger := slog.New(slog.NewTextHandler(logBuffer, &slog.HandlerOptions{Level: slog.LevelDebug}))
+	qp := new(mocks.QuoteProvider)
 	authSvc := new(authmocks.Authenticator)
 
-	srv := New(ctx, cancel, "TestServer", config, func(srv *grpc.Server) {}, logger, authSvc, "", "")
+	srv := New(ctx, cancel, "TestServer", config, func(srv *grpc.Server) {}, logger, qp, authSvc)
 
 	var wg sync.WaitGroup
 	wg.Add(1)
@@ -164,9 +144,10 @@ func TestServerStartWithmTLSFile(t *testing.T) {
 
 	logBuffer := &ThreadSafeBuffer{}
 	logger := slog.New(slog.NewTextHandler(logBuffer, &slog.HandlerOptions{Level: slog.LevelDebug}))
+	qp := new(mocks.QuoteProvider)
 	authSvc := new(authmocks.Authenticator)
 
-	srv := New(ctx, cancel, "TestServer", config, func(srv *grpc.Server) {}, logger, authSvc, "", "")
+	srv := New(ctx, cancel, "TestServer", config, func(srv *grpc.Server) {}, logger, qp, authSvc)
 
 	var wg sync.WaitGroup
 	wg.Add(1)
@@ -203,9 +184,10 @@ func TestServerStop(t *testing.T) {
 	}
 	buf := &ThreadSafeBuffer{}
 	logger := slog.New(slog.NewTextHandler(buf, &slog.HandlerOptions{Level: slog.LevelDebug}))
+	qp := new(mocks.QuoteProvider)
 	authSvc := new(authmocks.Authenticator)
 
-	srv := New(ctx, cancel, "TestServer", config, func(srv *grpc.Server) {}, logger, authSvc, "", "")
+	srv := New(ctx, cancel, "TestServer", config, func(srv *grpc.Server) {}, logger, qp, authSvc)
 
 	go func() {
 		err := srv.Start()
@@ -277,8 +259,6 @@ func (b *ThreadSafeBuffer) String() string {
 }
 
 func TestServerInitializationAndStartup(t *testing.T) {
-	vtpm.ExternalTPM = &DummyRWC{}
-
 	testCases := []struct {
 		name          string
 		config        server.AgentConfig
@@ -327,24 +307,20 @@ func TestServerInitializationAndStartup(t *testing.T) {
 			expectedLog: "failed to load auth certificates",
 		},
 		{
-			name: "maTLS Server Startup",
+			name: "mTLS Server Startup",
 			config: server.AgentConfig{
 				ServerConfig: server.ServerConfig{
 					BaseConfig: server.BaseConfig{
-						Host:         "localhost",
-						Port:         "0",
-						ServerCAFile: "",
-						ClientCAFile: "",
+						Host: "localhost",
+						Port: "0",
 					},
 				},
-				AttestedTLS: true,
 			},
 			setupCallback: setupMTLSConfig,
-			expectError:   false,
-			expectedLog:   "with Attested mTLS",
+			expectedLog:   "TestServer service gRPC server listening at localhost:0 with TLS",
 		},
 		{
-			name: "maTLS Server Startup with Invalid Server CA file",
+			name: "mTLS Server Startup with Invalid Root CA",
 			config: server.AgentConfig{
 				ServerConfig: server.ServerConfig{
 					BaseConfig: server.BaseConfig{
@@ -353,14 +329,13 @@ func TestServerInitializationAndStartup(t *testing.T) {
 						ServerCAFile: "invalid",
 					},
 				},
-				AttestedTLS: true,
 			},
 			setupCallback: setupInvalidRootCAConfig,
 			expectError:   true,
-			expectedLog:   "failed to load server ca file",
+			expectedLog:   "failed to append root ca to tls.Config",
 		},
 		{
-			name: "maTLS Server Startup with Invalid Clinet CA file",
+			name: "mTLS Server Startup with Invalid Client CA",
 			config: server.AgentConfig{
 				ServerConfig: server.ServerConfig{
 					BaseConfig: server.BaseConfig{
@@ -369,11 +344,23 @@ func TestServerInitializationAndStartup(t *testing.T) {
 						ServerCAFile: "invalid",
 					},
 				},
-				AttestedTLS: true,
 			},
 			setupCallback: setupInvalidClientCAConfig,
 			expectError:   true,
-			expectedLog:   "failed to load client ca file",
+			expectedLog:   "failed to append client ca to tls.Config",
+		},
+		{
+			name: "Attested TLS Server Startup",
+			config: server.AgentConfig{
+				ServerConfig: server.ServerConfig{
+					BaseConfig: server.BaseConfig{
+						Host: "localhost",
+						Port: "0",
+					},
+				},
+				AttestedTLS: true,
+			},
+			expectedLog: "TestServer service gRPC server listening at localhost:0 with Attested TLS",
 		},
 	}
 
@@ -387,9 +374,10 @@ func TestServerInitializationAndStartup(t *testing.T) {
 
 			logBuffer := &ThreadSafeBuffer{}
 			logger := slog.New(slog.NewTextHandler(logBuffer, &slog.HandlerOptions{Level: slog.LevelDebug}))
+			qp := new(mocks.QuoteProvider)
 			authSvc := new(authmocks.Authenticator)
 
-			srv := New(ctx, cancel, "TestServer", tc.config, func(srv *grpc.Server) {}, logger, authSvc, "", "")
+			srv := New(ctx, cancel, "TestServer", tc.config, func(srv *grpc.Server) {}, logger, qp, authSvc)
 			var wg sync.WaitGroup
 			wg.Add(1)
 

internal/server/mocks/server.go

@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0
 
-// Code generated by mockery v2.53.3. DO NOT EDIT.
+// Code generated by mockery v2.43.2. DO NOT EDIT.
 
 package mocks
 
@@ -20,7 +20,7 @@ func (_m *Server) EXPECT() *Server_Expecter {
 	return &Server_Expecter{mock: &_m.Mock}
 }
 
-// Start provides a mock function with no fields
+// Start provides a mock function with given fields:
 func (_m *Server) Start() error {
 	ret := _m.Called()
 
@@ -65,7 +65,7 @@ func (_c *Server_Start_Call) RunAndReturn(run func() error) *Server_Start_Call {
 	return _c
 }
 
-// Stop provides a mock function with no fields
+// Stop provides a mock function with given fields:
 func (_m *Server) Stop() error {
 	ret := _m.Called()
 

manager/README.md

@@ -6,70 +6,62 @@ Manager service provides a barebones gRPC API and Service interface implementati
 
 The service is configured using the environment variables from the following table. Note that any unset variables will be replaced with their default values.
 
-| Variable                                   | Description                                                                                                      | Default                        |
-| ------------------------------------------ | ---------------------------------------------------------------------------------------------------------------- | ------------------------------ |
-| COCOS_JAEGER_URL                           | The URL for the Jaeger tracing endpoint.                                                                         | http://localhost:4318          |
-| COCOS_JAEGER_TRACE_RATIO                   | The ratio of traces to sample.                                                                                   | 1.0                            |
-| MANAGER_INSTANCE_ID                        | The instance ID for the manager service.                                                                         |                                |
-| MANAGER_ATTESTATION_POLICY_BINARY          | The file path for the attestation policy binarie.                                                                | ../../build/attestation_policy |
-| MANAGER_IGVMMEASURE_BINARY                 | The file path for the igvmmeasure binarie.                                                                       | ../../build/igvmmeasure        |
-| MANAGER_PCR_VALUES                         | The file path for the file with the expected PCR values.                                                         |                                |
-| MANAGER_GRPC_CLIENT_CERT                   | The file path for the client certificate.                                                                        |                                |
-| MANAGER_GRPC_CLIENT_KEY                    | The file path for the client private key.                                                                        |                                |
-| MANAGER_GRPC_SERVER_CA_CERTS               | The file path for the server CA certificate(s).                                                                  |                                |
-| MANAGER_GRPC_URL                           | The URL for the gRPC endpoint.                                                                                   | localhost:7001                 |
-| MANAGER_GRPC_TIMEOUT                       | The timeout for gRPC requests.                                                                                   | 60s                            |
-| MANAGER_EOS_VERSION                        | The EOS version used for booting CVMs.                                                                           |                                |
-| MANAGER_INSTANCE_ID                        | Manager service instance ID                                                                                      |                                |
-| MANAGER_QEMU_MEMORY_SIZE                   | The total memory size for the virtual machine. Can be specified in a human-readable format like "2048M" or "4G". | 2048M                          |
-| MANAGER_QEMU_MEMORY_SLOTS                  | The number of memory slots for the virtual machine.                                                              | 5                              |
-| MANAGER_QEMU_MAX_MEMORY                    | The maximum memory size for the virtual machine. Can be specified in a human-readable format like "30G".         | 30G                            |
-| MANAGER_QEMU_OVMF_CODE_IF                  | The interface type for the OVMF code.                                                                            | pflash                         |
-| MANAGER_QEMU_OVMF_CODE_FORMAT              | The format of the OVMF code file.                                                                                | raw                            |
-| MANAGER_QEMU_OVMF_CODE_UNIT                | The unit number for the OVMF code.                                                                               | 0                              |
-| MANAGER_QEMU_OVMF_CODE_FILE                | The file path for the OVMF code.                                                                                 | /usr/share/OVMF/OVMF_CODE.fd   |
-| MANAGER_QEMU_OVMF_VERSION                  | The version number of EDKII from which OVMF was built                                                            | edk2-stable202408              |
-| MANAGER_QEMU_OVMF_CODE_READONLY            | Whether the OVMF code should be read-only.                                                                       | on                             |
-| MANAGER_QEMU_OVMF_VARS_IF                  | The interface type for the OVMF variables.                                                                       | pflash                         |
-| MANAGER_QEMU_OVMF_VARS_FORMAT              | The format of the OVMF variables file.                                                                           | raw                            |
-| MANAGER_QEMU_OVMF_VARS_UNIT                | The unit number for the OVMF variables.                                                                          | 1                              |
-| MANAGER_QEMU_OVMF_VARS_FILE                | The file path for the OVMF variables.                                                                            | /usr/share/OVMF/OVMF_VARS.fd   |
-| MANAGER_QEMU_NETDEV_ID                     | The ID for the network device.                                                                                   | vmnic                          |
-| MANAGER_QEMU_HOST_FWD_AGENT                | The port number for the host forward agent.                                                                      | 7020                           |
-| MANAGER_QEMU_GUEST_FWD_AGENT               | The port number for the guest forward agent.                                                                     | 7002                           |
-| MANAGER_QEMU_VIRTIO_NET_PCI_DISABLE_LEGACY | Whether to disable the legacy PCI device.                                                                        | on                             |
-| MANAGER_QEMU_VIRTIO_NET_PCI_IOMMU_PLATFORM | Whether to enable the IOMMU platform for the virtio-net PCI device.                                              | true                           |
-| MANAGER_QEMU_VIRTIO_NET_PCI_ADDR           | The PCI address for the virtio-net PCI device.                                                                   | 0x2                            |
-| MANAGER_QEMU_VIRTIO_NET_PCI_ROMFILE        | The file path for the ROM image for the virtio-net PCI device.                                                   |                                |
-| MANAGER_QEMU_DISK_IMG_KERNEL_FILE          | The file path for the kernel image.                                                                              | img/bzImage                    |
-| MANAGER_QEMU_DISK_IMG_ROOTFS_FILE          | The file path for the root filesystem image.                                                                     | img/rootfs.cpio.gz             |
-| MANAGER_QEMU_SEV_ID                        | The ID for the Secure Encrypted Virtualization (SEV) device.                                                     | sev0                           |
-| MANAGER_QEMU_SEV_CBITPOS                   | The position of the C-bit in the physical address.                                                               | 51                             |
-| MANAGER_QEMU_SEV_REDUCED_PHYS_BITS         | The number of reduced physical address bits for SEV.                                                             | 1                              |
-| MANAGER_QEMU_ENABLE_HOST_DATA              | Enable additional data for the SEV host.                                                                         | false                          |
-| MANAGER_QEMU_HOST_DATA                     | Additional data for the SEV host.                                                                                |                                |
-| MANAGER_QEMU_TDX_ID                        | The ID for the Trust Domain Extensions (TDX) device.                                                             | tdx0                           |
-| MANAGER_QEMU_QUOTE_GENERATION_PORT         | The port number for virtual socket used to communicate with the Quote Generation Service (QGS).                  | 4050                           |
-| MANAGER_QEMU_OVMF_FILE                     | The file path for the OVMF file (combined OVMF_CODE and OVMF_VARS file).                                         | /usr/share/ovmf/OVMF.fd        |
-| MANAGER_QEMU_IGVM_ID                       | The ID of the IGVM file.                                                                                         | igvm0                          |
-| MANAGER_QEMU_IGVM_FILE                     | The file path to the IGVM file.                                                                                  | /root/coconut-qemu.igvm        |
-| MANAGER_QEMU_VSOCK_ID                      | The ID for the virtual socket device.                                                                            | vhost-vsock-pci0               |
-| MANAGER_QEMU_VSOCK_GUEST_CID               | The guest-side CID (Context ID) for the virtual socket device.                                                   | 3                              |
-| MANAGER_QEMU_VSOCK_VNC                     | Whether to enable the virtual socket device for VNC.                                                             | 0                              |
-| MANAGER_QEMU_BIN_PATH                      | The file path for the QEMU binary.                                                                               | qemu-system-x86_64             |
-| MANAGER_QEMU_USE_SUDO                      | Whether to use sudo to run QEMU.                                                                                 | false                          |
-| MANAGER_QEMU_ENABLE_SEV                    | Whether to enable Secure Encrypted Virtualization (SEV).                                                         | false                          |
-| MANAGER_QEMU_ENABLE_SEV_SNP                | Whether to enable Secure Nested Paging (SEV-SNP).                                                                | true                           |
-| MANAGER_QEMU_ENABLE_TDX                    | Whether to enable Trust Domain Extensions (TDX).                                                                 | false                          |
-| MANAGER_QEMU_ENABLE_KVM                    | Whether to enable the Kernel-based Virtual Machine (KVM) acceleration.                                           | true                           |
-| MANAGER_QEMU_MACHINE                       | The machine type for QEMU.                                                                                       | q35                            |
-| MANAGER_QEMU_CPU                           | The CPU model for QEMU.                                                                                          | EPYC                           |
-| MANAGER_QEMU_SMP_COUNT                     | The number of virtual CPUs.                                                                                      | 4                              |
-| MANAGER_QEMU_SMP_MAXCPUS                   | The maximum number of virtual CPUs.                                                                              | 64                             |
-| MANAGER_QEMU_MEM_ID                        | The ID for the memory device.                                                                                    | ram1                           |
-| MANAGER_QEMU_NO_GRAPHIC                    | Whether to disable the graphical display.                                                                        | true                           |
-| MANAGER_QEMU_MONITOR                       | The type of monitor to use.                                                                                      | pty                            |
-| MANAGER_QEMU_HOST_FWD_RANGE                | The range of host ports to forward.                                                                              | 6100-6200                      |
+| Variable                                  | Description                                                                                                      | Default                      |
+| ----------------------------------------- | ---------------------------------------------------------------------------------------------------------------- | ---------------------------- |
+| COCOS_JAEGER_URL                          | The URL for the Jaeger tracing endpoint.                                                                         | http://localhost:4318        |
+| COCOS_JAEGER_TRACE_RATIO                  | The ratio of traces to sample.                                                                                   | 1.0                          |
+| MANAGER_INSTANCE_ID                       | The instance ID for the manager service.                                                                         |                              |
+| MANAGER_ATTESTATION_POLICY_BINARY         | The file path for the attestation policy binary.                                                                 | ../../build                  |
+| MANAGER_GRPC_CLIENT_CERT                  | The file path for the client certificate.                                                                        |                              |
+| MANAGER_GRPC_CLIENT_KEY                   | The file path for the client private key.                                                                        |                              |
+| MANAGER_GRPC_SERVER_CA_CERTS              | The file path for the server CA certificate(s).                                                                  |                              |
+| MANAGER_GRPC_URL                          | The URL for the gRPC endpoint.                                                                                   | localhost:7001               |
+| MANAGER_GRPC_TIMEOUT                      | The timeout for gRPC requests.                                                                                   | 60s                          |
+| MANAGER_EOS_VERSION                       | The EOS version used for booting SVMs.                                                                           |                              |
+| MANAGER_INSTANCE_ID                       | Manager service instance ID                                                                                      |                              |
+| MANAGER_QEMU_MEMORY_SIZE                  | The total memory size for the virtual machine. Can be specified in a human-readable format like "2048M" or "4G". | 2048M                        |
+| MANAGER_QEMU_MEMORY_SLOTS                 | The number of memory slots for the virtual machine.                                                              | 5                            |
+| MANAGER_QEMU_MAX_MEMORY                   | The maximum memory size for the virtual machine. Can be specified in a human-readable format like "30G".         | 30G                          |
+| MANAGER_QEMU_OVMF_CODE_IF                 | The interface type for the OVMF code.                                                                            | pflash                       |
+| MANAGER_QEMU_OVMF_CODE_FORMAT             | The format of the OVMF code file.                                                                                | raw                          |
+| MANAGER_QEMU_OVMF_CODE_UNIT               | The unit number for the OVMF code.                                                                               | 0                            |
+| MANAGER_QEMU_OVMF_CODE_FILE               | The file path for the OVMF code.                                                                                 | /usr/share/OVMF/OVMF_CODE.fd |
+| MANAGER_QEMU_OVMF_VERSION                 | The version number of EDKII from which OVMF was built                                                            | edk2-stable202408            |
+| MANAGER_QEMU_OVMF_CODE_READONLY           | Whether the OVMF code should be read-only.                                                                       | on                           |
+| MANAGER_QEMU_OVMF_VARS_IF                 | The interface type for the OVMF variables.                                                                       | pflash                       |
+| MANAGER_QEMU_OVMF_VARS_FORMAT             | The format of the OVMF variables file.                                                                           | raw                          |
+| MANAGER_QEMU_OVMF_VARS_UNIT               | The unit number for the OVMF variables.                                                                          | 1                            |
+| MANAGER_QEMU_OVMF_VARS_FILE               | The file path for the OVMF variables.                                                                            | /usr/share/OVMF/OVMF_VARS.fd |
+| MANAGER_QEMU_NETDEV_ID                    | The ID for the network device.                                                                                   | vmnic                        |
+| MANAGER_QEMU_HOST_FWD_AGENT               | The port number for the host forward agent.                                                                      | 7020                         |
+| MANAGER_QEMU_GUEST_FWD_AGENT              | The port number for the guest forward agent.                                                                     | 7002                         |
+| MANAGER_QEMU_VIRTIO_NET_PCI_DISABLE_LEGACY | Whether to disable the legacy PCI device.                                                                       | on                           |
+| MANAGER_QEMU_VIRTIO_NET_PCI_IOMMU_PLATFORM | Whether to enable the IOMMU platform for the virtio-net PCI device.                                             | true                         |
+| MANAGER_QEMU_VIRTIO_NET_PCI_ADDR           | The PCI address for the virtio-net PCI device.                                                                  | 0x2                          |
+| MANAGER_QEMU_VIRTIO_NET_PCI_ROMFILE        | The file path for the ROM image for the virtio-net PCI device.                                                  |                              |
+| MANAGER_QEMU_DISK_IMG_KERNEL_FILE          | The file path for the kernel image.                                                                             | img/bzImage                  |
+| MANAGER_QEMU_DISK_IMG_ROOTFS_FILE          | The file path for the root filesystem image.                                                                    | img/rootfs.cpio.gz           |
+| MANAGER_QEMU_SEV_ID                        | The ID for the Secure Encrypted Virtualization (SEV) device.                                                    | sev0                         |
+| MANAGER_QEMU_SEV_CBITPOS                   | The position of the C-bit in the physical address.                                                              | 51                           |
+| MANAGER_QEMU_SEV_REDUCED_PHYS_BITS         | The number of reduced physical address bits for SEV.                                                            | 1                            |
+| MANAGER_QEMU_HOST_DATA                     | Additional data for the SEV host.                                                                               |                              |
+| MANAGER_QEMU_VSOCK_ID                      | The ID for the virtual socket device.                                                                           | vhost-vsock-pci0             |
+| MANAGER_QEMU_VSOCK_GUEST_CID               | The guest-side CID (Context ID) for the virtual socket device.                                                  | 3                            |
+| MANAGER_QEMU_VSOCK_VNC                     | Whether to enable the virtual socket device for VNC.                                                            | 0                            |
+| MANAGER_QEMU_BIN_PATH                      | The file path for the QEMU binary.                                                                              | qemu-system-x86_64           |
+| MANAGER_QEMU_USE_SUDO                      | Whether to use sudo to run QEMU.                                                                                | false                        |
+| MANAGER_QEMU_ENABLE_SEV                    | Whether to enable Secure Encrypted Virtualization (SEV).                                                        | false                        |
+| MANAGER_QEMU_ENABLE_SEV_SNP                | Whether to enable Secure Nested Paging (SEV-SNP).                                                               | true                         |
+| MANAGER_QEMU_ENABLE_KVM                    | Whether to enable the Kernel-based Virtual Machine (KVM) acceleration.                                          | true                         |
+| MANAGER_QEMU_MACHINE                       | The machine type for QEMU.                                                                                      | q35                          |
+| MANAGER_QEMU_CPU                           | The CPU model for QEMU.                                                                                         | EPYC                         |
+| MANAGER_QEMU_SMP_COUNT                     | The number of virtual CPUs.                                                                                     | 4                            |
+| MANAGER_QEMU_SMP_MAXCPUS                   | The maximum number of virtual CPUs.                                                                             | 64                           |
+| MANAGER_QEMU_MEM_ID                        | The ID for the memory device.                                                                                   | ram1                         |
+| MANAGER_QEMU_KERNEL_HASH                   | Whether to enable kernel hash verification.                                                                     | false                        |
+| MANAGER_QEMU_NO_GRAPHIC                    | Whether to disable the graphical display.                                                                       | true                         |
+| MANAGER_QEMU_MONITOR                       | The type of monitor to use.                                                                                     | pty                          |
+| MANAGER_QEMU_HOST_FWD_RANGE                | The range of host ports to forward.                                                                             | 6100-6200                    |
 
 ## Setup
 
@@ -96,11 +88,21 @@ sudo apt install qemu-kvm
 
 Create `img` directory in `cmd/manager`.
 
-#### Virtual filesystem
+#### Add Vsock
+The necessary kernel modules must be loaded on the hypervisor. To check if `vhost_vsock` is loaded run:
+```shell
+lsmod | grep vhost_vsock
+```
 
-9P (or Plan 9 Filesystem) in QEMU is a lightweight, network-based file-sharing protocol. In Cocos, the 9P is used to transfer environment variables and TLS certificates for cloud communication from the Manager to the Agent.
+If `vhost_vsock` is not loaded run the following commands:
 
-You should define the environment variables in a file called environment. For the number and meaning of the environment variables, please refer to the Agent [Readme](https://github.com/ultravioletrs/cocos/blob/main/agent/README.md).
+```shell
+sudo modprobe vhost_vsock
+ls -l /dev/vhost-vsock
+# crw-rw-rw- 1 root kvm 10, 241 Jan 16 12:05 /dev/vhost-vsock
+ls -l /dev/vsock
+# crw-rw-rw- 1 root root 10, 121 Jan 16 12:05 /dev/vsock
+```
 
 ### Prepare Cocos HAL
 
@@ -120,32 +122,10 @@ OVMF_CODE=/usr/share/OVMF/OVMF_CODE.fd
 
 sudo find / -name OVMF_VARS.fd
 # => /usr/share/OVMF/OVMF_VARS.fd
+OVMF_VARS=/usr/share/OVMF/OVMF_VARS.fd
 
-# Create a local copy of OVMF_VARS.
-cp /usr/share/OVMF/OVMF_VARS.fd .
-
-# Create a directory for the environment file and the certificates for cloud certificates.
-mkdir env
-mkdir certs
-
-# Enter the env directory and create the environemnt file.
-cd env
-touch environment
-
-# Define Computations endpoint URL for agent.
-# Make sure the Computation endpoint is running (like Cocos Prism).
-echo AGENT_CVM_GRPC_URL=localhost:7001 >> ./environment
-# Define log level for the agent.
-echo AGENT_LOG_LEVEL=debug >> ./environment
-
-# Return to cmd/manager
-cd ..
-
-OVMF_VARS=./OVMF_VARS.fd
 KERNEL="img/bzImage"
 INITRD="img/rootfs.cpio.gz"
-ENV_PATH=./env
-CERTH_PATH=./certs
 
 qemu-system-x86_64 \
     -enable-kvm \
@@ -155,19 +135,15 @@ qemu-system-x86_64 \
     -m 2048M,slots=5,maxmem=10240M \
     -no-reboot \
     -drive if=pflash,format=raw,unit=0,file=$OVMF_CODE,readonly=on \
-    -drive if=pflash,format=raw,unit=1,file=$OVMF_VARS \
     -netdev user,id=vmnic,hostfwd=tcp::7020-:7002 \
     -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile= \
+    -device vhost-vsock-pci,id=vhost-vsock-pci0,guest-cid=3 -vnc :0 \
     -kernel $KERNEL \
     -append "earlyprintk=serial console=ttyS0" \
     -initrd $INITRD \
     -nographic \
     -monitor pty \
-    -monitor unix:monitor,server,nowait \
-    -fsdev local,id=env_fs,path=$ENV_PATH,security_model=mapped \
-    -device virtio-9p-pci,fsdev=env_fs,mount_tag=env_share \
-    -fsdev local,id=cert_fs,path=$CERTH_PATH,security_model=mapped \
-    -device virtio-9p-pci,fsdev=cert_fs,mount_tag=certs_share
+    -monitor unix:monitor,server,nowait
 ```
 Once the VM is booted press enter and on the login use username `root`.
 
@@ -212,21 +188,10 @@ MANAGER_QEMU_OVMF_VARS_FILE=/usr/share/OVMF/OVMF_VARS.fd
 
 NB: we set environment variables that we will use in the shell process where we run `manager`.
 
-### Trusted Platform Module (TPM)
-
-The Trusted Platform Module (TPM) plays a fundamental role in this process by providing a tamper-resistant foundation for cryptographic operations, securing sensitive artifacts, measuring system state, and enabling attestation mechanisms.
-
-### IGVM
-
-An IGVM file contains all the necessary information to launch a virtual machine on different virtualization platforms. It includes setup commands for the guest system and verification data to ensure the VM is loaded securely and correctly.
-
-Cocos uses the [COCONUT-SVSM](https://github.com/coconut-svsm/svsm/blob/main/Documentation/docs/installation/INSTALL.md) for the vTPM. The IGVM file contains the OVMF file and the vTPM.
 
 ## Deployment
 
-To start the service, execute the following shell script (note a server needs to be running see [here](../test/cvms/README.md)):
-
-The manager can be started as a *systemd* service or a standalone executable. To start the manager as a systemd service, look at the systemd service script [here](https://github.com/ultravioletrs/cocos/blob/main/init/systemd/cocos-manager.service). The environment variables are defined in the `cocos-manager.env` file. Below are examples of how to start the manager.
+To start the service, execute the following shell script (note a server needs to be running see  [here](../test/computations/README.md)):
 
 ```bash
 # Download the latest version of the service
@@ -238,14 +203,13 @@ cd cocos
 make manager
 
 # Set the environment variables and run the service
-MANAGER_GRPC_URL=localhost:7001 \
+MANAGER_GRPC_URL=localhost:7001
 MANAGER_LOG_LEVEL=debug \
 MANAGER_QEMU_USE_SUDO=false \
 MANAGER_QEMU_ENABLE_SEV=false \
 ./build/cocos-manager
 ```
 
-
 To enable [AMD SEV](https://www.amd.com/en/developer/sev.html) support, start manager like this 
 
 ```sh
@@ -257,7 +221,7 @@ MANAGER_QEMU_SEV_CBITPOS=51 \
 ./build/cocos-manager
 ```
 
-To start SEV-SNP, define the IGVM file that contains the vTPM and the OVMF (combined OVMF_CODE and OVMF_VARS) of the CVM.
+To build the OVMF with the kernel hash capability, we must build the AmdSev package of OVMF. The result of the build should be a single `OVMF.fd` file (unlike the regular two OVFM files). The OVMF package is located at `OvmfPkg/AmdSev/AmdSevX64.dsc`.
 
 To enable [AMD SEV-SNP](https://www.amd.com/en/developer/sev.html) support, start manager like this 
 
@@ -268,24 +232,60 @@ MANAGER_QEMU_ENABLE_SEV=false \
 MANAGER_QEMU_ENABLE_SEV_SNP=true \
 MANAGER_QEMU_SEV_CBITPOS=51 \
 MANAGER_QEMU_BIN_PATH=<path to QEMU binary> \
-MANAGER_QEMU_IGVM_FILE=<path to IGVM file> \
+MANAGER_QEMU_QEMU_OVMF_CODE_FILE=<path to OVMF.fd Amd Sev built package> \
 ./build/cocos-manager
 ```
 
-To enable [TDX](https://www.intel.com/content/www/us/en/developer/tools/trust-domain-extensions/overview.html) support, start manager like this
+To include the kernel hash into the measurement of the attestation report (SEV or SEV-SNP), start manager like this
 
 ```sh
 MANAGER_GRPC_URL=localhost:7001 \
 MANAGER_LOG_LEVEL=debug \
 MANAGER_QEMU_ENABLE_SEV=false \
-MANAGER_QEMU_ENABLE_SEV_SNP=false \
-MANAGER_QEMU_ENABLE_TDX=true \
-MANAGER_QEMU_CPU=host \
+MANAGER_QEMU_ENABLE_SEV_SNP=true \
+MANAGER_QEMU_SEV_CBITPOS=51 \
+MANAGER_QEMU_KERNEL_HASH=true \
 MANAGER_QEMU_BIN_PATH=<path to QEMU binary> \
-MANAGER_QEMU_OVMF_FILE=<path to OVMF file> \
+MANAGER_QEMU_QEMU_OVMF_CODE_FILE=<path to OVMF.fd Amd Sev built package> \
 ./build/cocos-manager
 ```
 
+### Verifying VM launch
+
+NB: To verify that the manager successfully launched the VM, you need to open three terminals on the same machine. In one terminal, you need to launch the computations server by executing (with the environment variables of choice):
+
+```bash
+go run ./test/computations/main.go <dataset path> <algo path>
+```
+
+and in the second the manager by executing (with the environment variables of choice):
+
+```bash
+go run ./cmd/manager/main.go
+```
+
+Ensure that the Manager can connect to the Manager test server by setting the MANAGER_GRPC_PORT with the port value of the Manager test server. In the last terminal, you can run the verification commands.
+
+To verify that the manager launched the VM successfully, run the following command:
+
+```sh
+ps aux | grep qemu-system-x86_64
+```
+
+You should get something similar to this
+```
+darko     324763 95.3  6.0 6398136 981044 ?      Sl   16:17   0:15 /usr/bin/qemu-system-x86_64 -enable-kvm -machine q35 -cpu EPYC -smp 4,maxcpus=64 -m 4096M,slots=5,maxmem=30G -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE.fd,readonly=on -drive if=pflash,format=raw,unit=1,file=img/OVMF_VARS.fd -device virtio-scsi-pci,id=scsi,disable-legacy=on,iommu_platform=true -drive file=img/focal-server-cloudimg-amd64.img,if=none,id=disk0,format=qcow2 -device scsi-hd,drive=disk0 -netdev user,id=vmnic,hostfwd=tcp::2222-:22,hostfwd=tcp::9301-:9031,hostfwd=tcp::7020-:7002 -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile= -nographic -monitor pty
+```
+
+If you run a command as `sudo`, you should get the output similar to this one
+
+```
+root       37982  0.0  0.0   9444  4572 pts/0    S+   16:18   0:00 sudo /usr/local/bin/qemu-system-x86_64 -enable-kvm -machine q35 -cpu EPYC -smp 4,maxcpus=64 -m 4096M,slots=5,maxmem=30G -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE.fd,readonly=on -drive if=pflash,format=raw,unit=1,file=img/OVMF_VARS.fd -device virtio-scsi-pci,id=scsi,disable-legacy=on,iommu_platform=true -drive file=img/focal-server-cloudimg-amd64.img,if=none,id=disk0,format=qcow2 -device scsi-hd,drive=disk0 -netdev user,id=vmnic,hostfwd=tcp::2222-:22,hostfwd=tcp::9301-:9031,hostfwd=tcp::7020-:7002 -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile= -object sev-guest,id=sev0,cbitpos=51,reduced-phys-bits=1 -machine memory-encryption=sev0 -nographic -monitor pty
+root       37989  122 13.1 5345816 4252312 pts/0 Sl+  16:19   0:04 /usr/local/bin/qemu-system-x86_64 -enable-kvm -machine q35 -cpu EPYC -smp 4,maxcpus=64 -m 4096M,slots=5,maxmem=30G -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE.fd,readonly=on -drive if=pflash,format=raw,unit=1,file=img/OVMF_VARS.fd -device virtio-scsi-pci,id=scsi,disable-legacy=on,iommu_platform=true -drive file=img/focal-server-cloudimg-amd64.img,if=none,id=disk0,format=qcow2 -device scsi-hd,drive=disk0 -netdev user,id=vmnic,hostfwd=tcp::2222-:22,hostfwd=tcp::9301-:9031,hostfwd=tcp::7020-:7002 -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile= -object sev-guest,id=sev0,cbitpos=51,reduced-phys-bits=1 -machine memory-encryption=sev0 -nographic -monitor pty
+```
+
+The two processes are due to the fact that we run the command `/usr/bin/qemu-system-x86_64` as `sudo`, so there is one process for `sudo` command and the other for `/usr/bin/qemu-system-x86_64`.
+
 ### Troubleshooting
 
 If the `ps aux | grep qemu-system-x86_64` give you something like this

manager/api/grpc/server.go

@@ -35,22 +35,22 @@ func (s *grpcServer) CreateVm(ctx context.Context, req *manager.CreateReq) (*man
 
 	return &manager.CreateRes{
 		ForwardedPort: port,
-		CvmId:         id,
+		SvmId:         id,
 	}, nil
 }
 
 func (s *grpcServer) RemoveVm(ctx context.Context, req *manager.RemoveReq) (*emptypb.Empty, error) {
-	if err := s.svc.RemoveVM(ctx, req.CvmId); err != nil {
+	if err := s.svc.RemoveVM(ctx, req.SvmId); err != nil {
 		return nil, err
 	}
 
 	return &emptypb.Empty{}, nil
 }
 
-func (s *grpcServer) CVMInfo(ctx context.Context, req *manager.CVMInfoReq) (*manager.CVMInfoRes, error) {
-	ovmf, cpunum, cputype, eosversion := s.svc.ReturnCVMInfo(ctx)
+func (s *grpcServer) SVMInfo(ctx context.Context, req *manager.SVMInfoReq) (*manager.SVMInfoRes, error) {
+	ovmf, cpunum, cputype, eosversion := s.svc.ReturnSVMInfo(ctx)
 
-	return &manager.CVMInfoRes{
+	return &manager.SVMInfoRes{
 		OvmfVersion: ovmf,
 		CpuNum:      int32(cpunum),
 		CpuType:     cputype,

manager/api/logging.go

@@ -67,11 +67,11 @@ func (lm *loggingMiddleware) FetchAttestationPolicy(ctx context.Context, cmpId s
 	return lm.svc.FetchAttestationPolicy(ctx, cmpId)
 }
 
-func (lm *loggingMiddleware) ReturnCVMInfo(ctx context.Context) (string, int, string, string) {
+func (lm *loggingMiddleware) ReturnSVMInfo(ctx context.Context) (string, int, string, string) {
 	defer func(begin time.Time) {
-		message := fmt.Sprintf("Method ReturnCVMInfo for computation took %s to complete", time.Since(begin))
+		message := fmt.Sprintf("Method ReturnSVMInfo for computation took %s to complete", time.Since(begin))
 		lm.logger.Info(message)
 	}(time.Now())
 
-	return lm.svc.ReturnCVMInfo(ctx)
+	return lm.svc.ReturnSVMInfo(ctx)
 }

manager/api/metrics.go

@@ -59,11 +59,11 @@ func (ms *metricsMiddleware) FetchAttestationPolicy(ctx context.Context, cmpId s
 	return ms.svc.FetchAttestationPolicy(ctx, cmpId)
 }
 
-func (ms *metricsMiddleware) ReturnCVMInfo(ctx context.Context) (string, int, string, string) {
+func (ms *metricsMiddleware) ReturnSVMInfo(ctx context.Context) (string, int, string, string) {
 	defer func(begin time.Time) {
-		ms.counter.With("method", "ReturnCVMInfo").Add(1)
-		ms.latency.With("method", "ReturnCVMInfo").Observe(time.Since(begin).Seconds())
+		ms.counter.With("method", "ReturnSVMInfo").Add(1)
+		ms.latency.With("method", "ReturnSVMInfo").Observe(time.Since(begin).Seconds())
 	}(time.Now())
 
-	return ms.svc.ReturnCVMInfo(ctx)
+	return ms.svc.ReturnSVMInfo(ctx)
 }

manager/attestation_policy.go

@@ -7,42 +7,25 @@
 package manager
 
 import (
-	"bufio"
-	"bytes"
 	"context"
 	"encoding/base64"
-	"encoding/hex"
-	"encoding/json"
 	"fmt"
+	"os"
+	"os/exec"
 	"strconv"
-	"strings"
 
 	"github.com/google/go-sev-guest/proto/check"
 	"github.com/ultravioletrs/cocos/manager/qemu"
-	"github.com/ultravioletrs/cocos/pkg/attestation"
-	"github.com/ultravioletrs/cocos/pkg/attestation/cmdconfig"
 	"github.com/virtee/sev-snp-measure-go/cpuid"
 	"github.com/virtee/sev-snp-measure-go/guest"
 	"github.com/virtee/sev-snp-measure-go/vmmtypes"
+	"google.golang.org/protobuf/encoding/protojson"
 )
 
 const defGuestFeatures = 0x1
 
 func (ms *managerService) FetchAttestationPolicy(_ context.Context, computationId string) ([]byte, error) {
-	var stderrBuffer bytes.Buffer
-	options := []string{"--policy", "196608"}
-
-	if ms.pcrValuesFilePath != "" {
-		pcrValues := []string{"--pcr", ms.pcrValuesFilePath}
-		options = append(options, pcrValues...)
-	}
-
-	stderr := bufio.NewWriter(&stderrBuffer)
-
-	attestPolicyCmd, err := cmdconfig.NewCmdConfig("sudo", options, stderr)
-	if err != nil {
-		return nil, err
-	}
+	cmd := exec.Command("sudo", fmt.Sprintf("%s/attestation_policy", ms.attestationPolicyBinaryPath), "--policy", "196608")
 
 	ms.mu.Lock()
 	vm, exists := ms.vms[computationId]
@@ -57,15 +40,22 @@ func (ms *managerService) FetchAttestationPolicy(_ context.Context, computationI
 	}
 
 	ms.ap.Lock()
-	stdOutByte, err := attestPolicyCmd.Run(ms.attestationPolicyBinaryPath)
+	_, err := cmd.Output()
 	ms.ap.Unlock()
 	if err != nil {
 		return nil, err
 	}
 
-	attestationPolicy := attestation.Config{Config: &check.Config{RootOfTrust: &check.RootOfTrust{}, Policy: &check.Policy{}}, PcrConfig: &attestation.PcrConfig{}}
+	ms.ap.Lock()
+	f, err := os.ReadFile("./attestation_policy.json")
+	ms.ap.Unlock()
+	if err != nil {
+		return nil, err
+	}
 
-	if err = attestation.ReadAttestationPolicyFromByte(stdOutByte, &attestationPolicy); err != nil {
+	var attestationPolicy check.Config
+
+	if err = protojson.Unmarshal(f, &attestationPolicy); err != nil {
 		return nil, err
 	}
 
@@ -77,50 +67,26 @@ func (ms *managerService) FetchAttestationPolicy(_ context.Context, computationI
 			return nil, err
 		}
 	case vmi.Config.EnableSEVSNP:
-		stderr := bufio.NewWriter(&stderrBuffer)
-		options := cmdconfig.IgvmMeasureOptions
-
-		igvmMeasurement, err := cmdconfig.NewCmdConfig(ms.igvmMeasurementBinaryPath, options, stderr)
-		if err != nil {
-			return nil, err
-		}
-
-		outputByte, err := igvmMeasurement.Run(ms.qemuCfg.IGVMConfig.File)
-		if err != nil {
-			return nil, err
-		}
-
-		outputString := string(outputByte)
-		lines := strings.Split(strings.TrimSpace(outputString), "\n")
-
-		if len(lines) == 1 {
-			outputString = strings.TrimSpace(outputString)
-			outputString = strings.ToLower(outputString)
-		} else {
-			return nil, fmt.Errorf("error: %s", outputString)
-		}
-
-		measurement, err = hex.DecodeString(outputString)
+		measurement, err = guest.CalcLaunchDigest(guest.SEV_SNP, vmi.Config.SMPCount, uint64(cpuid.CpuSigs[vmi.Config.CPU]), vmi.Config.OVMFCodeConfig.File, vmi.Config.KernelFile, vmi.Config.RootFsFile, strconv.Quote(qemu.KernelCommandLine), defGuestFeatures, "", vmmtypes.QEMU, false, "", 0)
 		if err != nil {
 			return nil, err
 		}
 	}
-
 	if measurement != nil {
-		attestationPolicy.Config.Policy.Measurement = measurement
+		attestationPolicy.Policy.Measurement = measurement
 	}
 
-	if vmi.Config.SEVConfig.EnableHostData {
-		hostData, err := base64.StdEncoding.DecodeString(vmi.Config.SEVConfig.HostData)
+	if vmi.Config.HostData != "" {
+		hostData, err := base64.StdEncoding.DecodeString(vmi.Config.HostData)
 		if err != nil {
 			return nil, err
 		}
-		attestationPolicy.Config.Policy.HostData = hostData
+		attestationPolicy.Policy.HostData = hostData
 	}
 
-	attestationPolicy.Config.Policy.MinimumLaunchTcb = vmi.LaunchTCB
+	attestationPolicy.Policy.MinimumLaunchTcb = vmi.LaunchTCB
 
-	f, err := json.MarshalIndent(attestationPolicy, "", " ")
+	f, err = protojson.Marshal(&attestationPolicy)
 	if err != nil {
 		return nil, err
 	}

manager/attestation_policy_test.go

@@ -6,7 +6,6 @@ import (
 	"context"
 	"encoding/json"
 	"os"
-	"path"
 	"path/filepath"
 	"testing"
 
@@ -21,7 +20,7 @@ func CreateDummyAttestationPolicyBinary(t *testing.T, behavior string) string {
 	switch behavior {
 	case "success":
 		content = []byte(`#!/bin/sh
-echo '{"pcr_values": {"sha256": null, "sha384": null}, "policy": {"measurement": null, "host_data": null}}'
+echo '{"policy": {"measurement": null, "host_data": null}}' > attestation_policy.json
 `)
 	case "fail":
 		content = []byte(`#!/bin/sh
@@ -58,10 +57,9 @@ func TestFetchAttestationPolicy(t *testing.T) {
 			binaryBehavior: "success",
 			vmConfig: qemu.VMInfo{
 				Config: qemu.Config{
-					EnableSEV:    true,
-					EnableSEVSNP: false,
-					SMPCount:     2,
-					CPU:          "EPYC",
+					EnableSEV: true,
+					SMPCount:  2,
+					CPU:       "EPYC",
 					OVMFCodeConfig: qemu.OVMFCodeConfig{
 						File: "/path/to/OVMF_CODE.fd",
 					},
@@ -70,6 +68,23 @@ func TestFetchAttestationPolicy(t *testing.T) {
 			},
 			expectedError: "open /path/to/OVMF_CODE.fd: no such file or directory",
 		},
+		{
+			name:           "Valid SEV-SNP configuration",
+			computationId:  "sev-snp-computation",
+			binaryBehavior: "success",
+			vmConfig: qemu.VMInfo{
+				Config: qemu.Config{
+					EnableSEVSNP: true,
+					SMPCount:     4,
+					CPU:          "EPYC-v2",
+					OVMFCodeConfig: qemu.OVMFCodeConfig{
+						File: "/path/to/OVMF_CODE_SNP.fd",
+					},
+				},
+				LaunchTCB: 0,
+			},
+			expectedError: "open /path/to/OVMF_CODE_SNP.fd: no such file or director",
+		},
 		{
 			name:           "Invalid computation ID",
 			computationId:  "non-existent",
@@ -106,7 +121,7 @@ func TestFetchAttestationPolicy(t *testing.T) {
 				},
 				LaunchTCB: 0,
 			},
-			expectedError: "failed to decode Attestation Policy file",
+			expectedError: "no such file or directory",
 		},
 	}
 
@@ -117,8 +132,7 @@ func TestFetchAttestationPolicy(t *testing.T) {
 
 			ms := &managerService{
 				vms:                         make(map[string]vm.VM),
-				attestationPolicyBinaryPath: path.Join(tempDir, "attestation_policy"),
-				pcrValuesFilePath:           tempDir,
+				attestationPolicyBinaryPath: tempDir,
 				qemuCfg: qemu.Config{
 					CPU: "EPYC",
 				},

manager/manager.pb.go

@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.5
+// 	protoc-gen-go v1.36.0
 // 	protoc        v5.29.0
 // source: manager/manager.proto
 
@@ -15,7 +15,6 @@ import (
 	emptypb "google.golang.org/protobuf/types/known/emptypb"
 	reflect "reflect"
 	sync "sync"
-	unsafe "unsafe"
 )
 
 const (
@@ -32,8 +31,6 @@ type CreateReq struct {
 	AgentCvmClientKey    []byte                 `protobuf:"bytes,3,opt,name=agent_cvm_client_key,json=agentCvmClientKey,proto3" json:"agent_cvm_client_key,omitempty"`
 	AgentCvmClientCert   []byte                 `protobuf:"bytes,4,opt,name=agent_cvm_client_cert,json=agentCvmClientCert,proto3" json:"agent_cvm_client_cert,omitempty"`
 	AgentCvmServerUrl    string                 `protobuf:"bytes,5,opt,name=agent_cvm_server_url,json=agentCvmServerUrl,proto3" json:"agent_cvm_server_url,omitempty"`
-	AgentCvmCaUrl        string                 `protobuf:"bytes,6,opt,name=agent_cvm_ca_url,json=agentCvmCaUrl,proto3" json:"agent_cvm_ca_url,omitempty"`
-	Ttl                  string                 `protobuf:"bytes,7,opt,name=ttl,proto3" json:"ttl,omitempty"`
 	unknownFields        protoimpl.UnknownFields
 	sizeCache            protoimpl.SizeCache
 }
@@ -103,24 +100,10 @@ func (x *CreateReq) GetAgentCvmServerUrl() string {
 	return ""
 }
 
-func (x *CreateReq) GetAgentCvmCaUrl() string {
-	if x != nil {
-		return x.AgentCvmCaUrl
-	}
-	return ""
-}
-
-func (x *CreateReq) GetTtl() string {
-	if x != nil {
-		return x.Ttl
-	}
-	return ""
-}
-
 type CreateRes struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	ForwardedPort string                 `protobuf:"bytes,1,opt,name=forwarded_port,json=forwardedPort,proto3" json:"forwarded_port,omitempty"`
-	CvmId         string                 `protobuf:"bytes,2,opt,name=cvm_id,json=cvmId,proto3" json:"cvm_id,omitempty"`
+	SvmId         string                 `protobuf:"bytes,2,opt,name=svm_id,json=svmId,proto3" json:"svm_id,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -162,16 +145,16 @@ func (x *CreateRes) GetForwardedPort() string {
 	return ""
 }
 
-func (x *CreateRes) GetCvmId() string {
+func (x *CreateRes) GetSvmId() string {
 	if x != nil {
-		return x.CvmId
+		return x.SvmId
 	}
 	return ""
 }
 
 type RemoveReq struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
-	CvmId         string                 `protobuf:"bytes,1,opt,name=cvm_id,json=cvmId,proto3" json:"cvm_id,omitempty"`
+	SvmId         string                 `protobuf:"bytes,1,opt,name=svm_id,json=svmId,proto3" json:"svm_id,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -206,9 +189,9 @@ func (*RemoveReq) Descriptor() ([]byte, []int) {
 	return file_manager_manager_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *RemoveReq) GetCvmId() string {
+func (x *RemoveReq) GetSvmId() string {
 	if x != nil {
-		return x.CvmId
+		return x.SvmId
 	}
 	return ""
 }
@@ -265,7 +248,7 @@ func (x *AttestationPolicyRes) GetId() string {
 	return ""
 }
 
-type CVMInfoRes struct {
+type SVMInfoRes struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	OvmfVersion   string                 `protobuf:"bytes,2,opt,name=ovmf_version,json=ovmfVersion,proto3" json:"ovmf_version,omitempty"`
@@ -277,20 +260,20 @@ type CVMInfoRes struct {
 	sizeCache     protoimpl.SizeCache
 }
 
-func (x *CVMInfoRes) Reset() {
-	*x = CVMInfoRes{}
+func (x *SVMInfoRes) Reset() {
+	*x = SVMInfoRes{}
 	mi := &file_manager_manager_proto_msgTypes[4]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 
-func (x *CVMInfoRes) String() string {
+func (x *SVMInfoRes) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*CVMInfoRes) ProtoMessage() {}
+func (*SVMInfoRes) ProtoMessage() {}
 
-func (x *CVMInfoRes) ProtoReflect() protoreflect.Message {
+func (x *SVMInfoRes) ProtoReflect() protoreflect.Message {
 	mi := &file_manager_manager_proto_msgTypes[4]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -302,47 +285,47 @@ func (x *CVMInfoRes) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CVMInfoRes.ProtoReflect.Descriptor instead.
-func (*CVMInfoRes) Descriptor() ([]byte, []int) {
+// Deprecated: Use SVMInfoRes.ProtoReflect.Descriptor instead.
+func (*SVMInfoRes) Descriptor() ([]byte, []int) {
 	return file_manager_manager_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *CVMInfoRes) GetId() string {
+func (x *SVMInfoRes) GetId() string {
 	if x != nil {
 		return x.Id
 	}
 	return ""
 }
 
-func (x *CVMInfoRes) GetOvmfVersion() string {
+func (x *SVMInfoRes) GetOvmfVersion() string {
 	if x != nil {
 		return x.OvmfVersion
 	}
 	return ""
 }
 
-func (x *CVMInfoRes) GetCpuNum() int32 {
+func (x *SVMInfoRes) GetCpuNum() int32 {
 	if x != nil {
 		return x.CpuNum
 	}
 	return 0
 }
 
-func (x *CVMInfoRes) GetCpuType() string {
+func (x *SVMInfoRes) GetCpuType() string {
 	if x != nil {
 		return x.CpuType
 	}
 	return ""
 }
 
-func (x *CVMInfoRes) GetKernelCmd() string {
+func (x *SVMInfoRes) GetKernelCmd() string {
 	if x != nil {
 		return x.KernelCmd
 	}
 	return ""
 }
 
-func (x *CVMInfoRes) GetEosVersion() string {
+func (x *SVMInfoRes) GetEosVersion() string {
 	if x != nil {
 		return x.EosVersion
 	}
@@ -393,27 +376,27 @@ func (x *AttestationPolicyReq) GetId() string {
 	return ""
 }
 
-type CVMInfoReq struct {
+type SVMInfoReq struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
 
-func (x *CVMInfoReq) Reset() {
-	*x = CVMInfoReq{}
+func (x *SVMInfoReq) Reset() {
+	*x = SVMInfoReq{}
 	mi := &file_manager_manager_proto_msgTypes[6]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
 
-func (x *CVMInfoReq) String() string {
+func (x *SVMInfoReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*CVMInfoReq) ProtoMessage() {}
+func (*SVMInfoReq) ProtoMessage() {}
 
-func (x *CVMInfoReq) ProtoReflect() protoreflect.Message {
+func (x *SVMInfoReq) ProtoReflect() protoreflect.Message {
 	mi := &file_manager_manager_proto_msgTypes[6]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -425,12 +408,12 @@ func (x *CVMInfoReq) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CVMInfoReq.ProtoReflect.Descriptor instead.
-func (*CVMInfoReq) Descriptor() ([]byte, []int) {
+// Deprecated: Use SVMInfoReq.ProtoReflect.Descriptor instead.
+func (*SVMInfoReq) Descriptor() ([]byte, []int) {
 	return file_manager_manager_proto_rawDescGZIP(), []int{6}
 }
 
-func (x *CVMInfoReq) GetId() string {
+func (x *SVMInfoReq) GetId() string {
 	if x != nil {
 		return x.Id
 	}
@@ -439,11 +422,11 @@ func (x *CVMInfoReq) GetId() string {
 
 var File_manager_manager_proto protoreflect.FileDescriptor
 
-var file_manager_manager_proto_rawDesc = string([]byte{
+var file_manager_manager_proto_rawDesc = []byte{
 	0x0a, 0x15, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65,
 	0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x07, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
 	0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbb, 0x02,
+	0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x80, 0x02,
 	0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x26, 0x0a, 0x0f, 0x61,
 	0x67, 0x65, 0x6e, 0x74, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x4c, 0x6f, 0x67, 0x4c, 0x65,
@@ -460,65 +443,61 @@ var file_manager_manager_proto_rawDesc = string([]byte{
 	0x2f, 0x0a, 0x14, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x76, 0x6d, 0x5f, 0x73, 0x65, 0x72,
 	0x76, 0x65, 0x72, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x61,
 	0x67, 0x65, 0x6e, 0x74, 0x43, 0x76, 0x6d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x55, 0x72, 0x6c,
-	0x12, 0x27, 0x0a, 0x10, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x76, 0x6d, 0x5f, 0x63, 0x61,
-	0x5f, 0x75, 0x72, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x43, 0x76, 0x6d, 0x43, 0x61, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x74, 0x6c,
-	0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x22, 0x49, 0x0a, 0x09, 0x43,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x66, 0x6f, 0x72, 0x77,
-	0x61, 0x72, 0x64, 0x65, 0x64, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0d, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x65, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x12,
-	0x15, 0x0a, 0x06, 0x63, 0x76, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x05, 0x63, 0x76, 0x6d, 0x49, 0x64, 0x22, 0x22, 0x0a, 0x09, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65,
-	0x52, 0x65, 0x71, 0x12, 0x15, 0x0a, 0x06, 0x63, 0x76, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x76, 0x6d, 0x49, 0x64, 0x22, 0x3a, 0x0a, 0x14, 0x41, 0x74,
-	0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52,
-	0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c,
-	0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0xb3, 0x01, 0x0a, 0x0a, 0x43, 0x56, 0x4d, 0x49, 0x6e,
-	0x66, 0x6f, 0x52, 0x65, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x6f, 0x76, 0x6d, 0x66, 0x5f, 0x76, 0x65,
-	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6f, 0x76, 0x6d,
-	0x66, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x63, 0x70, 0x75, 0x5f,
-	0x6e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x70, 0x75, 0x4e, 0x75,
-	0x6d, 0x12, 0x19, 0x0a, 0x08, 0x63, 0x70, 0x75, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x70, 0x75, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x0a, 0x0a,
-	0x6b, 0x65, 0x72, 0x6e, 0x65, 0x6c, 0x5f, 0x63, 0x6d, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x6b, 0x65, 0x72, 0x6e, 0x65, 0x6c, 0x43, 0x6d, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x65,
-	0x6f, 0x73, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0a, 0x65, 0x6f, 0x73, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x26, 0x0a, 0x14,
+	0x22, 0x49, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x12, 0x25, 0x0a,
+	0x0e, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x65, 0x64, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x65, 0x64,
+	0x50, 0x6f, 0x72, 0x74, 0x12, 0x15, 0x0a, 0x06, 0x73, 0x76, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x76, 0x6d, 0x49, 0x64, 0x22, 0x22, 0x0a, 0x09, 0x52,
+	0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x15, 0x0a, 0x06, 0x73, 0x76, 0x6d, 0x5f,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x76, 0x6d, 0x49, 0x64, 0x22,
+	0x3a, 0x0a, 0x14, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f,
+	0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0xb3, 0x01, 0x0a, 0x0a,
+	0x53, 0x56, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x6f, 0x76,
+	0x6d, 0x66, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0b, 0x6f, 0x76, 0x6d, 0x66, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x17, 0x0a,
+	0x07, 0x63, 0x70, 0x75, 0x5f, 0x6e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
+	0x63, 0x70, 0x75, 0x4e, 0x75, 0x6d, 0x12, 0x19, 0x0a, 0x08, 0x63, 0x70, 0x75, 0x5f, 0x74, 0x79,
+	0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x70, 0x75, 0x54, 0x79, 0x70,
+	0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x6b, 0x65, 0x72, 0x6e, 0x65, 0x6c, 0x5f, 0x63, 0x6d, 0x64, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6b, 0x65, 0x72, 0x6e, 0x65, 0x6c, 0x43, 0x6d, 0x64,
+	0x12, 0x1f, 0x0a, 0x0b, 0x65, 0x6f, 0x73, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18,
+	0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x6f, 0x73, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f,
+	0x6e, 0x22, 0x26, 0x0a, 0x14, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x1c, 0x0a, 0x0a, 0x53, 0x56, 0x4d,
+	0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x32, 0x8c, 0x02, 0x0a, 0x0e, 0x4d, 0x61, 0x6e, 0x61,
+	0x67, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x34, 0x0a, 0x08, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x56, 0x6d, 0x12, 0x12, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
+	0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x12, 0x2e, 0x6d, 0x61, 0x6e,
+	0x61, 0x67, 0x65, 0x72, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x22, 0x00,
+	0x12, 0x38, 0x0a, 0x08, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x56, 0x6d, 0x12, 0x12, 0x2e, 0x6d,
+	0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x65, 0x71,
+	0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x35, 0x0a, 0x07, 0x53, 0x56,
+	0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x13, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e,
+	0x53, 0x56, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x1a, 0x13, 0x2e, 0x6d, 0x61, 0x6e,
+	0x61, 0x67, 0x65, 0x72, 0x2e, 0x53, 0x56, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x22,
+	0x00, 0x12, 0x53, 0x0a, 0x11, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x1d, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72,
+	0x2e, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x6c, 0x69,
+	0x63, 0x79, 0x52, 0x65, 0x71, 0x1a, 0x1d, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e,
 	0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x6c, 0x69, 0x63,
-	0x79, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x02, 0x69, 0x64, 0x22, 0x1c, 0x0a, 0x0a, 0x43, 0x56, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x52,
-	0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
-	0x69, 0x64, 0x32, 0x8c, 0x02, 0x0a, 0x0e, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x53, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x34, 0x0a, 0x08, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x56,
-	0x6d, 0x12, 0x12, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x43, 0x72, 0x65, 0x61,
-	0x74, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x12, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e,
-	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x22, 0x00, 0x12, 0x38, 0x0a, 0x08, 0x52,
-	0x65, 0x6d, 0x6f, 0x76, 0x65, 0x56, 0x6d, 0x12, 0x12, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65,
-	0x72, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x16, 0x2e, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d,
-	0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x35, 0x0a, 0x07, 0x43, 0x56, 0x4d, 0x49, 0x6e, 0x66, 0x6f,
-	0x12, 0x13, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x43, 0x56, 0x4d, 0x49, 0x6e,
-	0x66, 0x6f, 0x52, 0x65, 0x71, 0x1a, 0x13, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e,
-	0x43, 0x56, 0x4d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x22, 0x00, 0x12, 0x53, 0x0a, 0x11,
-	0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x6c, 0x69, 0x63,
-	0x79, 0x12, 0x1d, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x41, 0x74, 0x74, 0x65,
-	0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x71,
-	0x1a, 0x1d, 0x2e, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x2e, 0x41, 0x74, 0x74, 0x65, 0x73,
-	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x65, 0x73, 0x22,
-	0x00, 0x42, 0x0b, 0x5a, 0x09, 0x2e, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x72, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-})
+	0x79, 0x52, 0x65, 0x73, 0x22, 0x00, 0x42, 0x0b, 0x5a, 0x09, 0x2e, 0x2f, 0x6d, 0x61, 0x6e, 0x61,
+	0x67, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
 
 var (
 	file_manager_manager_proto_rawDescOnce sync.Once
-	file_manager_manager_proto_rawDescData []byte
+	file_manager_manager_proto_rawDescData = file_manager_manager_proto_rawDesc
 )
 
 func file_manager_manager_proto_rawDescGZIP() []byte {
 	file_manager_manager_proto_rawDescOnce.Do(func() {
-		file_manager_manager_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_manager_manager_proto_rawDesc), len(file_manager_manager_proto_rawDesc)))
+		file_manager_manager_proto_rawDescData = protoimpl.X.CompressGZIP(file_manager_manager_proto_rawDescData)
 	})
 	return file_manager_manager_proto_rawDescData
 }
@@ -529,19 +508,19 @@ var file_manager_manager_proto_goTypes = []any{
 	(*CreateRes)(nil),            // 1: manager.CreateRes
 	(*RemoveReq)(nil),            // 2: manager.RemoveReq
 	(*AttestationPolicyRes)(nil), // 3: manager.AttestationPolicyRes
-	(*CVMInfoRes)(nil),           // 4: manager.CVMInfoRes
+	(*SVMInfoRes)(nil),           // 4: manager.SVMInfoRes
 	(*AttestationPolicyReq)(nil), // 5: manager.AttestationPolicyReq
-	(*CVMInfoReq)(nil),           // 6: manager.CVMInfoReq
+	(*SVMInfoReq)(nil),           // 6: manager.SVMInfoReq
 	(*emptypb.Empty)(nil),        // 7: google.protobuf.Empty
 }
 var file_manager_manager_proto_depIdxs = []int32{
 	0, // 0: manager.ManagerService.CreateVm:input_type -> manager.CreateReq
 	2, // 1: manager.ManagerService.RemoveVm:input_type -> manager.RemoveReq
-	6, // 2: manager.ManagerService.CVMInfo:input_type -> manager.CVMInfoReq
+	6, // 2: manager.ManagerService.SVMInfo:input_type -> manager.SVMInfoReq
 	5, // 3: manager.ManagerService.AttestationPolicy:input_type -> manager.AttestationPolicyReq
 	1, // 4: manager.ManagerService.CreateVm:output_type -> manager.CreateRes
 	7, // 5: manager.ManagerService.RemoveVm:output_type -> google.protobuf.Empty
-	4, // 6: manager.ManagerService.CVMInfo:output_type -> manager.CVMInfoRes
+	4, // 6: manager.ManagerService.SVMInfo:output_type -> manager.SVMInfoRes
 	3, // 7: manager.ManagerService.AttestationPolicy:output_type -> manager.AttestationPolicyRes
 	4, // [4:8] is the sub-list for method output_type
 	0, // [0:4] is the sub-list for method input_type
@@ -559,7 +538,7 @@ func file_manager_manager_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_manager_manager_proto_rawDesc), len(file_manager_manager_proto_rawDesc)),
+			RawDescriptor: file_manager_manager_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   7,
 			NumExtensions: 0,
@@ -570,6 +549,7 @@ func file_manager_manager_proto_init() {
 		MessageInfos:      file_manager_manager_proto_msgTypes,
 	}.Build()
 	File_manager_manager_proto = out.File
+	file_manager_manager_proto_rawDesc = nil
 	file_manager_manager_proto_goTypes = nil
 	file_manager_manager_proto_depIdxs = nil
 }

manager/manager.proto

@@ -12,7 +12,7 @@ option go_package = "./manager";
 service ManagerService {
   rpc CreateVm(CreateReq) returns (CreateRes) {}
   rpc RemoveVm(RemoveReq) returns (google.protobuf.Empty) {}
-  rpc CVMInfo(CVMInfoReq) returns (CVMInfoRes) {}
+  rpc SVMInfo(SVMInfoReq) returns (SVMInfoRes) {}
   rpc AttestationPolicy(AttestationPolicyReq) returns (AttestationPolicyRes) {}
 }
 
@@ -22,17 +22,15 @@ message CreateReq{
   bytes agent_cvm_client_key = 3;
   bytes agent_cvm_client_cert = 4;
   string agent_cvm_server_url = 5;
-  string agent_cvm_ca_url = 6;
-  string ttl = 7;
 }
 
 message CreateRes{
   string forwarded_port = 1;
-  string cvm_id = 2;
+  string svm_id = 2;
 }
 
 message RemoveReq{
-  string cvm_id = 1;
+  string svm_id = 1;
 }
 
 message AttestationPolicyRes{
@@ -40,7 +38,7 @@ message AttestationPolicyRes{
   string id = 2;
 }
 
-message CVMInfoRes{
+message SVMInfoRes{
   string id = 1;
   string ovmf_version = 2;
   int32 cpu_num = 3;
@@ -53,7 +51,7 @@ message AttestationPolicyReq {
   string id = 1;
 }
 
-message CVMInfoReq {
+message SVMInfoReq {
   string id = 1;
 }
 

manager/manager_grpc.pb.go

@@ -25,7 +25,7 @@ const _ = grpc.SupportPackageIsVersion9
 const (
 	ManagerService_CreateVm_FullMethodName          = "/manager.ManagerService/CreateVm"
 	ManagerService_RemoveVm_FullMethodName          = "/manager.ManagerService/RemoveVm"
-	ManagerService_CVMInfo_FullMethodName           = "/manager.ManagerService/CVMInfo"
+	ManagerService_SVMInfo_FullMethodName           = "/manager.ManagerService/SVMInfo"
 	ManagerService_AttestationPolicy_FullMethodName = "/manager.ManagerService/AttestationPolicy"
 )
 
@@ -35,7 +35,7 @@ const (
 type ManagerServiceClient interface {
 	CreateVm(ctx context.Context, in *CreateReq, opts ...grpc.CallOption) (*CreateRes, error)
 	RemoveVm(ctx context.Context, in *RemoveReq, opts ...grpc.CallOption) (*emptypb.Empty, error)
-	CVMInfo(ctx context.Context, in *CVMInfoReq, opts ...grpc.CallOption) (*CVMInfoRes, error)
+	SVMInfo(ctx context.Context, in *SVMInfoReq, opts ...grpc.CallOption) (*SVMInfoRes, error)
 	AttestationPolicy(ctx context.Context, in *AttestationPolicyReq, opts ...grpc.CallOption) (*AttestationPolicyRes, error)
 }
 
@@ -67,10 +67,10 @@ func (c *managerServiceClient) RemoveVm(ctx context.Context, in *RemoveReq, opts
 	return out, nil
 }
 
-func (c *managerServiceClient) CVMInfo(ctx context.Context, in *CVMInfoReq, opts ...grpc.CallOption) (*CVMInfoRes, error) {
+func (c *managerServiceClient) SVMInfo(ctx context.Context, in *SVMInfoReq, opts ...grpc.CallOption) (*SVMInfoRes, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(CVMInfoRes)
-	err := c.cc.Invoke(ctx, ManagerService_CVMInfo_FullMethodName, in, out, cOpts...)
+	out := new(SVMInfoRes)
+	err := c.cc.Invoke(ctx, ManagerService_SVMInfo_FullMethodName, in, out, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -93,7 +93,7 @@ func (c *managerServiceClient) AttestationPolicy(ctx context.Context, in *Attest
 type ManagerServiceServer interface {
 	CreateVm(context.Context, *CreateReq) (*CreateRes, error)
 	RemoveVm(context.Context, *RemoveReq) (*emptypb.Empty, error)
-	CVMInfo(context.Context, *CVMInfoReq) (*CVMInfoRes, error)
+	SVMInfo(context.Context, *SVMInfoReq) (*SVMInfoRes, error)
 	AttestationPolicy(context.Context, *AttestationPolicyReq) (*AttestationPolicyRes, error)
 	mustEmbedUnimplementedManagerServiceServer()
 }
@@ -111,8 +111,8 @@ func (UnimplementedManagerServiceServer) CreateVm(context.Context, *CreateReq) (
 func (UnimplementedManagerServiceServer) RemoveVm(context.Context, *RemoveReq) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RemoveVm not implemented")
 }
-func (UnimplementedManagerServiceServer) CVMInfo(context.Context, *CVMInfoReq) (*CVMInfoRes, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method CVMInfo not implemented")
+func (UnimplementedManagerServiceServer) SVMInfo(context.Context, *SVMInfoReq) (*SVMInfoRes, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method SVMInfo not implemented")
 }
 func (UnimplementedManagerServiceServer) AttestationPolicy(context.Context, *AttestationPolicyReq) (*AttestationPolicyRes, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AttestationPolicy not implemented")
@@ -174,20 +174,20 @@ func _ManagerService_RemoveVm_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
-func _ManagerService_CVMInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(CVMInfoReq)
+func _ManagerService_SVMInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SVMInfoReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(ManagerServiceServer).CVMInfo(ctx, in)
+		return srv.(ManagerServiceServer).SVMInfo(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: ManagerService_CVMInfo_FullMethodName,
+		FullMethod: ManagerService_SVMInfo_FullMethodName,
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ManagerServiceServer).CVMInfo(ctx, req.(*CVMInfoReq))
+		return srv.(ManagerServiceServer).SVMInfo(ctx, req.(*SVMInfoReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -226,8 +226,8 @@ var ManagerService_ServiceDesc = grpc.ServiceDesc{
 			Handler:    _ManagerService_RemoveVm_Handler,
 		},
 		{
-			MethodName: "CVMInfo",
-			Handler:    _ManagerService_CVMInfo_Handler,
+			MethodName: "SVMInfo",
+			Handler:    _ManagerService_SVMInfo_Handler,
 		},
 		{
 			MethodName: "AttestationPolicy",

manager/mocks/manager_service_client.go

@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0
 
-// Code generated by mockery v2.53.3. DO NOT EDIT.
+// Code generated by mockery v2.43.2. DO NOT EDIT.
 
 package mocks
 
@@ -103,80 +103,6 @@ func (_c *ManagerServiceClient_AttestationPolicy_Call) RunAndReturn(run func(con
 	return _c
 }
 
-// CVMInfo provides a mock function with given fields: ctx, in, opts
-func (_m *ManagerServiceClient) CVMInfo(ctx context.Context, in *manager.CVMInfoReq, opts ...grpc.CallOption) (*manager.CVMInfoRes, error) {
-	_va := make([]interface{}, len(opts))
-	for _i := range opts {
-		_va[_i] = opts[_i]
-	}
-	var _ca []interface{}
-	_ca = append(_ca, ctx, in)
-	_ca = append(_ca, _va...)
-	ret := _m.Called(_ca...)
-
-	if len(ret) == 0 {
-		panic("no return value specified for CVMInfo")
-	}
-
-	var r0 *manager.CVMInfoRes
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, *manager.CVMInfoReq, ...grpc.CallOption) (*manager.CVMInfoRes, error)); ok {
-		return rf(ctx, in, opts...)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, *manager.CVMInfoReq, ...grpc.CallOption) *manager.CVMInfoRes); ok {
-		r0 = rf(ctx, in, opts...)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*manager.CVMInfoRes)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, *manager.CVMInfoReq, ...grpc.CallOption) error); ok {
-		r1 = rf(ctx, in, opts...)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// ManagerServiceClient_CVMInfo_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CVMInfo'
-type ManagerServiceClient_CVMInfo_Call struct {
-	*mock.Call
-}
-
-// CVMInfo is a helper method to define mock.On call
-//   - ctx context.Context
-//   - in *manager.CVMInfoReq
-//   - opts ...grpc.CallOption
-func (_e *ManagerServiceClient_Expecter) CVMInfo(ctx interface{}, in interface{}, opts ...interface{}) *ManagerServiceClient_CVMInfo_Call {
-	return &ManagerServiceClient_CVMInfo_Call{Call: _e.mock.On("CVMInfo",
-		append([]interface{}{ctx, in}, opts...)...)}
-}
-
-func (_c *ManagerServiceClient_CVMInfo_Call) Run(run func(ctx context.Context, in *manager.CVMInfoReq, opts ...grpc.CallOption)) *ManagerServiceClient_CVMInfo_Call {
-	_c.Call.Run(func(args mock.Arguments) {
-		variadicArgs := make([]grpc.CallOption, len(args)-2)
-		for i, a := range args[2:] {
-			if a != nil {
-				variadicArgs[i] = a.(grpc.CallOption)
-			}
-		}
-		run(args[0].(context.Context), args[1].(*manager.CVMInfoReq), variadicArgs...)
-	})
-	return _c
-}
-
-func (_c *ManagerServiceClient_CVMInfo_Call) Return(_a0 *manager.CVMInfoRes, _a1 error) *ManagerServiceClient_CVMInfo_Call {
-	_c.Call.Return(_a0, _a1)
-	return _c
-}
-
-func (_c *ManagerServiceClient_CVMInfo_Call) RunAndReturn(run func(context.Context, *manager.CVMInfoReq, ...grpc.CallOption) (*manager.CVMInfoRes, error)) *ManagerServiceClient_CVMInfo_Call {
-	_c.Call.Return(run)
-	return _c
-}
-
 // CreateVm provides a mock function with given fields: ctx, in, opts
 func (_m *ManagerServiceClient) CreateVm(ctx context.Context, in *manager.CreateReq, opts ...grpc.CallOption) (*manager.CreateRes, error) {
 	_va := make([]interface{}, len(opts))
@@ -325,6 +251,80 @@ func (_c *ManagerServiceClient_RemoveVm_Call) RunAndReturn(run func(context.Cont
 	return _c
 }
 
+// SVMInfo provides a mock function with given fields: ctx, in, opts
+func (_m *ManagerServiceClient) SVMInfo(ctx context.Context, in *manager.SVMInfoReq, opts ...grpc.CallOption) (*manager.SVMInfoRes, error) {
+	_va := make([]interface{}, len(opts))
+	for _i := range opts {
+		_va[_i] = opts[_i]
+	}
+	var _ca []interface{}
+	_ca = append(_ca, ctx, in)
+	_ca = append(_ca, _va...)
+	ret := _m.Called(_ca...)
+
+	if len(ret) == 0 {
+		panic("no return value specified for SVMInfo")
+	}
+
+	var r0 *manager.SVMInfoRes
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *manager.SVMInfoReq, ...grpc.CallOption) (*manager.SVMInfoRes, error)); ok {
+		return rf(ctx, in, opts...)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *manager.SVMInfoReq, ...grpc.CallOption) *manager.SVMInfoRes); ok {
+		r0 = rf(ctx, in, opts...)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*manager.SVMInfoRes)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *manager.SVMInfoReq, ...grpc.CallOption) error); ok {
+		r1 = rf(ctx, in, opts...)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// ManagerServiceClient_SVMInfo_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SVMInfo'
+type ManagerServiceClient_SVMInfo_Call struct {
+	*mock.Call
+}
+
+// SVMInfo is a helper method to define mock.On call
+//   - ctx context.Context
+//   - in *manager.SVMInfoReq
+//   - opts ...grpc.CallOption
+func (_e *ManagerServiceClient_Expecter) SVMInfo(ctx interface{}, in interface{}, opts ...interface{}) *ManagerServiceClient_SVMInfo_Call {
+	return &ManagerServiceClient_SVMInfo_Call{Call: _e.mock.On("SVMInfo",
+		append([]interface{}{ctx, in}, opts...)...)}
+}
+
+func (_c *ManagerServiceClient_SVMInfo_Call) Run(run func(ctx context.Context, in *manager.SVMInfoReq, opts ...grpc.CallOption)) *ManagerServiceClient_SVMInfo_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		variadicArgs := make([]grpc.CallOption, len(args)-2)
+		for i, a := range args[2:] {
+			if a != nil {
+				variadicArgs[i] = a.(grpc.CallOption)
+			}
+		}
+		run(args[0].(context.Context), args[1].(*manager.SVMInfoReq), variadicArgs...)
+	})
+	return _c
+}
+
+func (_c *ManagerServiceClient_SVMInfo_Call) Return(_a0 *manager.SVMInfoRes, _a1 error) *ManagerServiceClient_SVMInfo_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *ManagerServiceClient_SVMInfo_Call) RunAndReturn(run func(context.Context, *manager.SVMInfoReq, ...grpc.CallOption) (*manager.SVMInfoRes, error)) *ManagerServiceClient_SVMInfo_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // NewManagerServiceClient creates a new instance of ManagerServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
 func NewManagerServiceClient(t interface {

manager/mocks/service.go

@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0
 
-// Code generated by mockery v2.53.3. DO NOT EDIT.
+// Code generated by mockery v2.43.2. DO NOT EDIT.
 
 package mocks
 
@@ -195,12 +195,12 @@ func (_c *Service_RemoveVM_Call) RunAndReturn(run func(context.Context, string)
 	return _c
 }
 
-// ReturnCVMInfo provides a mock function with given fields: ctx
-func (_m *Service) ReturnCVMInfo(ctx context.Context) (string, int, string, string) {
+// ReturnSVMInfo provides a mock function with given fields: ctx
+func (_m *Service) ReturnSVMInfo(ctx context.Context) (string, int, string, string) {
 	ret := _m.Called(ctx)
 
 	if len(ret) == 0 {
-		panic("no return value specified for ReturnCVMInfo")
+		panic("no return value specified for ReturnSVMInfo")
 	}
 
 	var r0 string
@@ -237,30 +237,30 @@ func (_m *Service) ReturnCVMInfo(ctx context.Context) (string, int, string, stri
 	return r0, r1, r2, r3
 }
 
-// Service_ReturnCVMInfo_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ReturnCVMInfo'
-type Service_ReturnCVMInfo_Call struct {
+// Service_ReturnSVMInfo_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ReturnSVMInfo'
+type Service_ReturnSVMInfo_Call struct {
 	*mock.Call
 }
 
-// ReturnCVMInfo is a helper method to define mock.On call
+// ReturnSVMInfo is a helper method to define mock.On call
 //   - ctx context.Context
-func (_e *Service_Expecter) ReturnCVMInfo(ctx interface{}) *Service_ReturnCVMInfo_Call {
-	return &Service_ReturnCVMInfo_Call{Call: _e.mock.On("ReturnCVMInfo", ctx)}
+func (_e *Service_Expecter) ReturnSVMInfo(ctx interface{}) *Service_ReturnSVMInfo_Call {
+	return &Service_ReturnSVMInfo_Call{Call: _e.mock.On("ReturnSVMInfo", ctx)}
 }
 
-func (_c *Service_ReturnCVMInfo_Call) Run(run func(ctx context.Context)) *Service_ReturnCVMInfo_Call {
+func (_c *Service_ReturnSVMInfo_Call) Run(run func(ctx context.Context)) *Service_ReturnSVMInfo_Call {
 	_c.Call.Run(func(args mock.Arguments) {
 		run(args[0].(context.Context))
 	})
 	return _c
 }
 
-func (_c *Service_ReturnCVMInfo_Call) Return(_a0 string, _a1 int, _a2 string, _a3 string) *Service_ReturnCVMInfo_Call {
+func (_c *Service_ReturnSVMInfo_Call) Return(_a0 string, _a1 int, _a2 string, _a3 string) *Service_ReturnSVMInfo_Call {
 	_c.Call.Return(_a0, _a1, _a2, _a3)
 	return _c
 }
 
-func (_c *Service_ReturnCVMInfo_Call) RunAndReturn(run func(context.Context) (string, int, string, string)) *Service_ReturnCVMInfo_Call {
+func (_c *Service_ReturnSVMInfo_Call) RunAndReturn(run func(context.Context) (string, int, string, string)) *Service_ReturnSVMInfo_Call {
 	_c.Call.Return(run)
 	return _c
 }

manager/qemu/config.go

@@ -5,14 +5,11 @@ package qemu
 import (
 	"fmt"
 	"strconv"
-
-	"github.com/caarlos0/env/v10"
 )
 
 const (
 	BaseGuestCID      = 3
 	KernelCommandLine = "quiet console=null"
-	TdxObject         = "'{\"qom-type\":\"tdx-guest\",\"id\":\"%s\",\"quote-generation-socket\":{\"type\": \"vsock\", \"cid\":\"2\",\"port\":\"%d\"}}'"
 )
 
 type MemoryConfig struct {
@@ -55,23 +52,11 @@ type DiskImgConfig struct {
 	RootFsFile string `env:"DISK_IMG_ROOTFS_FILE" envDefault:"img/rootfs.cpio.gz"`
 }
 
-type SEVConfig struct {
+type SevConfig struct {
 	ID              string `env:"SEV_ID"                envDefault:"sev0"`
 	CBitPos         int    `env:"SEV_CBITPOS"           envDefault:"51"`
 	ReducedPhysBits int    `env:"SEV_REDUCED_PHYS_BITS" envDefault:"1"`
-	EnableHostData  bool   `env:"ENABLE_HOST_DATA"      envDefault:"false"`
-	HostData        string `env:"HOST_DATA"             envDefault:""`
-}
-
-type TDXConfig struct {
-	ID                  string `env:"TDX_ID"                  envDefault:"tdx0"`
-	QuoteGenerationPort int    `env:"QUOTE_GENERATION_PORT"   envDefault:"4050"`
-	OVMF                string `env:"OVMF_FILE"               envDefault:"/usr/share/ovmf/OVMF.fd"`
-}
-
-type IGVMConfig struct {
-	ID   string `env:"IGVM_ID"        envDefault:"igvm0"`
-	File string `env:"IGVM_FILE"      envDefault:"/root/coconut-qemu.igvm"`
+	HostData        string `env:"HOST_DATA" envDefault:""`
 }
 
 type VSockConfig struct {
@@ -80,11 +65,10 @@ type VSockConfig struct {
 }
 
 type Config struct {
-	EnableSEV    bool
-	EnableSEVSNP bool
-	EnableTDX    bool
 	QemuBinPath  string `env:"BIN_PATH"       envDefault:"qemu-system-x86_64"`
 	UseSudo      bool   `env:"USE_SUDO"       envDefault:"false"`
+	EnableSEV    bool   `env:"ENABLE_SEV"     envDefault:"false"`
+	EnableSEVSNP bool   `env:"ENABLE_SEV_SNP" envDefault:"true"`
 
 	EnableKVM bool `env:"ENABLE_KVM" envDefault:"true"`
 
@@ -96,6 +80,9 @@ type Config struct {
 	MemID    string `env:"MEM_ID"      envDefault:"ram1"`
 	MemoryConfig
 
+	// Kernel hash
+	KernelHash bool `env:"KERNEL_HASH" envDefault:"false"`
+
 	// OVMF
 	OVMFCodeConfig
 	OVMFVarsConfig
@@ -111,13 +98,7 @@ type Config struct {
 	DiskImgConfig
 
 	// SEV
-	SEVConfig
-
-	// TDX
-	TDXConfig
-
-	// vTPM
-	IGVMConfig
+	SevConfig
 
 	// display
 	NoGraphic bool   `env:"NO_GRAPHIC" envDefault:"true"`
@@ -155,7 +136,7 @@ func (config Config) ConstructQemuArgs() []string {
 		config.MemoryConfig.Slots,
 		config.MemoryConfig.Max))
 
-	if !config.EnableSEVSNP && !config.EnableTDX {
+	if !config.EnableSEVSNP {
 		// OVMF
 		args = append(args, "-drive",
 			fmt.Sprintf("if=%s,format=%s,unit=%d,file=%s,readonly=%s",
@@ -192,59 +173,40 @@ func (config Config) ConstructQemuArgs() []string {
 	// SEV
 	if config.EnableSEV || config.EnableSEVSNP {
 		sevType := "sev-guest"
+		kernelHash := ""
 		hostData := ""
 
 		args = append(args, "-machine",
-			fmt.Sprintf("confidential-guest-support=%s,memory-backend=%s,igvm-cfg=%s",
-				config.SEVConfig.ID,
-				config.MemID,
-				config.IGVMConfig.ID))
+			fmt.Sprintf("confidential-guest-support=%s,memory-backend=%s",
+				config.SevConfig.ID,
+				config.MemID))
 
 		if config.EnableSEVSNP {
+			args = append(args, "-bios", config.OVMFCodeConfig.File)
 			sevType = "sev-snp-guest"
 
-			if config.SEVConfig.EnableHostData {
-				hostData = fmt.Sprintf(",host-data=%s", config.SEVConfig.HostData)
+			if config.SevConfig.HostData != "" {
+				hostData = fmt.Sprintf(",host-data=%s", config.SevConfig.HostData)
 			}
 		}
 
+		if config.KernelHash {
+			kernelHash = ",kernel-hashes=on"
+		}
+
 		args = append(args, "-object",
 			fmt.Sprintf("memory-backend-memfd,id=%s,size=%s,share=true,prealloc=false",
 				config.MemID,
 				config.MemoryConfig.Size))
 
 		args = append(args, "-object",
-			fmt.Sprintf("%s,id=%s,cbitpos=%d,reduced-phys-bits=%d%s",
+			fmt.Sprintf("%s,id=%s,cbitpos=%d,reduced-phys-bits=%d%s%s",
 				sevType,
-				config.SEVConfig.ID,
-				config.SEVConfig.CBitPos,
-				config.SEVConfig.ReducedPhysBits,
+				config.SevConfig.ID,
+				config.SevConfig.CBitPos,
+				config.SevConfig.ReducedPhysBits,
+				kernelHash,
 				hostData))
-
-		args = append(args, "-object",
-			fmt.Sprintf("igvm-cfg,id=%s,file=%s",
-				config.IGVMConfig.ID,
-				config.IGVMConfig.File))
-	}
-
-	if config.EnableTDX {
-		args = append(args, "-object",
-			fmt.Sprintf(TdxObject,
-				config.TDXConfig.ID,
-				config.TDXConfig.QuoteGenerationPort))
-
-		args = append(args, "-machine",
-			fmt.Sprintf("confidential-guest-support=%s,memory-backend=%s,hpet=off",
-				config.TDXConfig.ID,
-				config.MemID))
-
-		args = append(args, "-object",
-			fmt.Sprintf("memory-backend-memfd,id=%s,size=%s,share=true,prealloc=false",
-				config.MemID,
-				config.MemoryConfig.Size))
-
-		args = append(args, "-bios", config.TDXConfig.OVMF)
-		args = append(args, "-nodefaults")
 	}
 
 	args = append(args, "-kernel", config.DiskImgConfig.KernelFile)
@@ -270,17 +232,3 @@ func (config Config) ConstructQemuArgs() []string {
 
 	return args
 }
-
-func NewConfig() (*Config, error) {
-	cfg := Config{}
-
-	if err := env.Parse(&cfg); err != nil {
-		return nil, err
-	}
-
-	cfg.EnableSEV = SEVEnabledOnHost()
-	cfg.EnableSEVSNP = SEVSNPEnabledOnHost()
-	cfg.EnableTDX = TDXEnabledOnHost()
-
-	return &cfg, nil
-}

manager/qemu/config_test.go

@@ -127,15 +127,11 @@ func TestConstructQemuArgs(t *testing.T) {
 					KernelFile: "img/bzImage",
 					RootFsFile: "img/rootfs.cpio.gz",
 				},
-				SEVConfig: SEVConfig{
+				SevConfig: SevConfig{
 					ID:              "sev0",
 					CBitPos:         51,
 					ReducedPhysBits: 1,
 				},
-				IGVMConfig: IGVMConfig{
-					ID:   "igvm0",
-					File: "/test/path/cocos-igvm.igvm",
-				},
 				NoGraphic: true,
 				Monitor:   "pty",
 			},
@@ -148,10 +144,10 @@ func TestConstructQemuArgs(t *testing.T) {
 				"-netdev", "user,id=vmnic,hostfwd=tcp::7020-:7002",
 				"-device", "virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,addr=0x2,romfile=",
 				"-device", "vhost-vsock-pci,id=vhost-vsock-pci0,guest-cid=3",
-				"-machine", "confidential-guest-support=sev0,memory-backend=ram1,igvm-cfg=igvm0",
+				"-machine", "confidential-guest-support=sev0,memory-backend=ram1",
+				"-bios", "/usr/share/OVMF/OVMF_CODE.fd",
 				"-object", "memory-backend-memfd,id=ram1,size=2048M,share=true,prealloc=false",
 				"-object", "sev-snp-guest,id=sev0,cbitpos=51,reduced-phys-bits=1",
-				"-object", "igvm-cfg,id=igvm0,file=/test/path/cocos-igvm.igvm",
 				"-kernel", "img/bzImage",
 				"-append", "\"quiet console=null\"",
 				"-initrd", "img/rootfs.cpio.gz",
@@ -171,14 +167,44 @@ func TestConstructQemuArgs(t *testing.T) {
 	}
 }
 
-func TestConstructQemuArgs_HostData(t *testing.T) {
+func TestConstructQemuArgs_KernelHash(t *testing.T) {
 	config := Config{
 		EnableSEVSNP: true,
-		SEVConfig: SEVConfig{
+		KernelHash:   true,
+		SevConfig: SevConfig{
+			ID:              "sev0",
+			CBitPos:         51,
+			ReducedPhysBits: 1,
+		},
+	}
+
+	result := config.ConstructQemuArgs()
+
+	expected := "-object"
+	expectedValue := "sev-snp-guest,id=sev0,cbitpos=51,reduced-phys-bits=1,kernel-hashes=on"
+
+	found := false
+	for i, arg := range result {
+		if arg == expected && i+1 < len(result) {
+			if result[i+1] == expectedValue {
+				found = true
+				break
+			}
+		}
+	}
+
+	if !found {
+		t.Errorf("ConstructQemuArgs() did not contain expected SEV-SNP configuration with kernel hashes enabled")
+	}
+}
+
+func TestConstructQemuArgs_HostData(t *testing.T) {
+	config := Config{
+		EnableSEVSNP: true,
+		SevConfig: SevConfig{
 			ID:              "sev0",
 			CBitPos:         51,
 			ReducedPhysBits: 1,
-			EnableHostData:  true,
 			HostData:        "test-host-data",
 		},
 	}

manager/qemu/mocks/persistence.go

@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0
 
-// Code generated by mockery v2.53.3. DO NOT EDIT.
+// Code generated by mockery v2.43.2. DO NOT EDIT.
 
 package mocks
 
@@ -69,7 +69,7 @@ func (_c *Persistence_DeleteVM_Call) RunAndReturn(run func(string) error) *Persi
 	return _c
 }
 
-// LoadVMs provides a mock function with no fields
+// LoadVMs provides a mock function with given fields:
 func (_m *Persistence) LoadVMs() ([]qemu.VMState, error) {
 	ret := _m.Called()
 

manager/qemu/vm.go

@@ -4,10 +4,8 @@ package qemu
 
 import (
 	"fmt"
-	"log/slog"
 	"os"
 	"os/exec"
-	"strings"
 	"syscall"
 	"time"
 
@@ -32,19 +30,17 @@ type VMInfo struct {
 }
 
 type qemuVM struct {
-	vmi    VMInfo
-	cmd    *exec.Cmd
-	cvmId  string
-	logger *slog.Logger
+	vmi           VMInfo
+	cmd           *exec.Cmd
+	computationId string
 	vm.StateMachine
 }
 
-func NewVM(config interface{}, cvmId string, logger *slog.Logger) vm.VM {
+func NewVM(config interface{}, computationId string) vm.VM {
 	return &qemuVM{
-		vmi:          config.(VMInfo),
-		cvmId:        cvmId,
-		StateMachine: vm.NewStateMachine(),
-		logger:       logger,
+		vmi:           config.(VMInfo),
+		computationId: computationId,
+		StateMachine:  vm.NewStateMachine(),
 	}
 }
 
@@ -61,10 +57,9 @@ func (v *qemuVM) Start() (err error) {
 	}
 
 	v.vmi.Config.NetDevConfig.ID = fmt.Sprintf("%s-%s", v.vmi.Config.NetDevConfig.ID, id)
-	v.vmi.Config.SEVConfig.ID = fmt.Sprintf("%s-%s", v.vmi.Config.SEVConfig.ID, id)
-	v.vmi.Config.TDXConfig.ID = fmt.Sprintf("%s-%s", v.vmi.Config.TDXConfig.ID, id)
+	v.vmi.Config.SevConfig.ID = fmt.Sprintf("%s-%s", v.vmi.Config.SevConfig.ID, id)
 
-	if !v.vmi.Config.EnableSEVSNP {
+	if !v.vmi.Config.KernelHash {
 		// Copy firmware vars file.
 		srcFile := v.vmi.Config.OVMFVarsConfig.File
 		dstFile := fmt.Sprintf("%s/%s-%s.fd", tmpDir, firmwareVars, id)
@@ -81,8 +76,8 @@ func (v *qemuVM) Start() (err error) {
 	}
 
 	v.cmd = exec.Command(exe, args...)
-	v.cmd.Stdout = &vm.Stdout{StateMachine: v.StateMachine, Logger: v.logger.With(slog.String("cvm", v.cvmId))}
-	v.cmd.Stderr = &vm.Stderr{StateMachine: v.StateMachine, Logger: v.logger.With(slog.String("cvm", v.cvmId))}
+	v.cmd.Stdout = os.Stdout
+	v.cmd.Stderr = os.Stderr
 
 	return v.cmd.Start()
 }
@@ -199,54 +194,3 @@ func (v *qemuVM) GetCID() int {
 func (v *qemuVM) GetConfig() interface{} {
 	return v.vmi
 }
-
-func SEVEnabled(cpuinfo string, sevPresent bool) bool {
-	return strings.Contains(cpuinfo, "sev") && sevPresent
-}
-
-func SEVSNPEnabled(cpuinfo, kernelParam string) bool {
-	return strings.Contains(cpuinfo, "sev_snp") && strings.TrimSpace(kernelParam) == "1"
-}
-
-func TDXEnabled(cpuinfo, kernelParam string) bool {
-	return strings.Contains(cpuinfo, "tdx_host_platform") && strings.TrimSpace(kernelParam) == "1"
-}
-
-// Checks if SEV is supported and usable by verifying both CPU flags and the /dev/sev device.
-func SEVEnabledOnHost() bool {
-	cpuinfo, err := os.ReadFile("/proc/cpuinfo")
-	if err != nil {
-		return false
-	}
-
-	_, err = os.Stat("/dev/sev")
-	return SEVEnabled(string(cpuinfo), err == nil)
-}
-
-func SEVSNPEnabledOnHost() bool {
-	cpuinfo, err := os.ReadFile("/proc/cpuinfo")
-	if err != nil {
-		return false
-	}
-
-	kernelParam, err := os.ReadFile("/sys/module/kvm_amd/parameters/sev_snp")
-	if err != nil {
-		return false
-	}
-
-	return SEVSNPEnabled(string(cpuinfo), string(kernelParam))
-}
-
-func TDXEnabledOnHost() bool {
-	cpuinfo, err := os.ReadFile("/proc/cpuinfo")
-	if err != nil {
-		return false
-	}
-
-	kernelParam, err := os.ReadFile("/sys/module/kvm_intel/parameters/tdx")
-	if err != nil {
-		return false
-	}
-
-	return TDXEnabled(string(cpuinfo), string(kernelParam))
-}

manager/qemu/vm_test.go

@@ -3,7 +3,6 @@
 package qemu
 
 import (
-	"log/slog"
 	"os"
 	"os/exec"
 	"testing"
@@ -18,7 +17,7 @@ const testComputationID = "test-computation"
 func TestNewVM(t *testing.T) {
 	config := VMInfo{Config: Config{}}
 
-	vm := NewVM(config, testComputationID, slog.Default())
+	vm := NewVM(config, testComputationID)
 
 	assert.NotNil(t, vm)
 	assert.IsType(t, &qemuVM{}, vm)
@@ -37,7 +36,7 @@ func TestStart(t *testing.T) {
 		QemuBinPath: "echo",
 	}}
 
-	vm := NewVM(config, testComputationID, slog.Default()).(*qemuVM)
+	vm := NewVM(config, testComputationID).(*qemuVM)
 
 	err = vm.Start()
 	assert.NoError(t, err)
@@ -60,7 +59,7 @@ func TestStartSudo(t *testing.T) {
 		UseSudo:     true,
 	}}
 
-	vm := NewVM(config, testComputationID, slog.Default()).(*qemuVM)
+	vm := NewVM(config, testComputationID).(*qemuVM)
 
 	err = vm.Start()
 	assert.NoError(t, err)
@@ -161,45 +160,3 @@ func TestGetConfig(t *testing.T) {
 	config := vm.GetConfig()
 	assert.Equal(t, expectedConfig, config)
 }
-
-func TestSEVEnabled(t *testing.T) {
-	t.Run("cpuinfo contains sev and device exists", func(t *testing.T) {
-		assert.True(t, SEVEnabled("flags: xyz sev abc", true))
-	})
-
-	t.Run("cpuinfo missing sev", func(t *testing.T) {
-		assert.False(t, SEVEnabled("flags: xyz abc", true))
-	})
-
-	t.Run("device does not exist", func(t *testing.T) {
-		assert.False(t, SEVEnabled("flags: sev abc", false))
-	})
-}
-
-func TestSEVSNPEnabled(t *testing.T) {
-	t.Run("cpuinfo and kvm param correct", func(t *testing.T) {
-		assert.True(t, SEVSNPEnabled("flags: sev_snp abc", "1"))
-	})
-
-	t.Run("missing sev_snp in cpuinfo", func(t *testing.T) {
-		assert.False(t, SEVSNPEnabled("flags: abc", "1"))
-	})
-
-	t.Run("kernel param not enabled", func(t *testing.T) {
-		assert.False(t, SEVSNPEnabled("flags: sev_snp", "0"))
-	})
-}
-
-func TestTDXEnabled(t *testing.T) {
-	t.Run("cpuinfo and kvm param correct", func(t *testing.T) {
-		assert.True(t, TDXEnabled("flags: tdx_host_platform abc", "1"))
-	})
-
-	t.Run("missing tdx_host_platform in cpuinfo", func(t *testing.T) {
-		assert.False(t, TDXEnabled("flags: abc", "1"))
-	})
-
-	t.Run("kernel param not enabled", func(t *testing.T) {
-		assert.False(t, TDXEnabled("flags: tdx_host_platform", "0"))
-	})
-}

manager/service.go

@@ -3,29 +3,26 @@
 package manager
 
 import (
-	"bufio"
-	"bytes"
 	"context"
 	"encoding/base64"
 	"fmt"
 	"log/slog"
 	"net"
 	"os"
+	"os/exec"
 	"regexp"
 	"strconv"
 	"sync"
 	"syscall"
-	"time"
 
 	"github.com/absmach/magistrala/pkg/errors"
 	"github.com/google/go-sev-guest/proto/check"
 	"github.com/google/uuid"
 	"github.com/ultravioletrs/cocos/manager/qemu"
 	"github.com/ultravioletrs/cocos/manager/vm"
-	"github.com/ultravioletrs/cocos/pkg/attestation"
-	"github.com/ultravioletrs/cocos/pkg/attestation/cmdconfig"
 	"github.com/ultravioletrs/cocos/pkg/manager"
 	"golang.org/x/crypto/sha3"
+	"google.golang.org/protobuf/encoding/protojson"
 )
 
 const (
@@ -36,8 +33,6 @@ const (
 	agentCvmClientCertKey   = "AGENT_CVM_GRPC_CLIENT_CERT"
 	agentCvmClientKey       = "AGENT_CVM_GRPC_CLIENT_KEY"
 	agentCvmServerCaCertKey = "AGENT_CVM_GRPC_SERVER_CA_CERTS"
-	agentCvmId              = "AGENT_CVM_ID"
-	agentCvmCaUrl           = "AGENT_CVM_CA_URL"
 	defClientCertPath       = "/etc/certs/cert.pem"
 	defClientKeyPath        = "/etc/certs/key.pem"
 	defServerCaCertPath     = "/etc/certs/ca.pem"
@@ -81,8 +76,8 @@ type Service interface {
 	RemoveVM(ctx context.Context, computationID string) error
 	// FetchAttestationPolicy measures and fetches the attestation policy.
 	FetchAttestationPolicy(ctx context.Context, computationID string) ([]byte, error)
-	// ReturnCVMInfo returns CVM information needed for attestation verification and validation.
-	ReturnCVMInfo(ctx context.Context) (string, int, string, string)
+	// ReturnSVMInfo returns SVM information needed for attestation verification and validation.
+	ReturnSVMInfo(ctx context.Context) (string, int, string, string)
 }
 
 type managerService struct {
@@ -90,8 +85,6 @@ type managerService struct {
 	ap                          sync.Mutex
 	qemuCfg                     qemu.Config
 	attestationPolicyBinaryPath string
-	igvmMeasurementBinaryPath   string
-	pcrValuesFilePath           string
 	logger                      *slog.Logger
 	vms                         map[string]vm.VM
 	vmFactory                   vm.Provider
@@ -99,13 +92,12 @@ type managerService struct {
 	portRangeMax                int
 	persistence                 qemu.Persistence
 	eosVersion                  string
-	ctx                         context.Context
 }
 
 var _ Service = (*managerService)(nil)
 
 // New instantiates the manager service implementation.
-func New(ctx context.Context, cfg qemu.Config, attestationPolicyBinPath string, igvmMeasurementBinaryPath string, pcrValuesFilePath string, logger *slog.Logger, vmFactory vm.Provider, eosVersion string) (Service, error) {
+func New(cfg qemu.Config, attestationPolicyBinPath string, logger *slog.Logger, vmFactory vm.Provider, eosVersion string) (Service, error) {
 	start, end, err := decodeRange(cfg.HostFwdRange)
 	if err != nil {
 		return nil, err
@@ -122,13 +114,10 @@ func New(ctx context.Context, cfg qemu.Config, attestationPolicyBinPath string,
 		vms:                         make(map[string]vm.VM),
 		vmFactory:                   vmFactory,
 		attestationPolicyBinaryPath: attestationPolicyBinPath,
-		igvmMeasurementBinaryPath:   igvmMeasurementBinaryPath,
-		pcrValuesFilePath:           pcrValuesFilePath,
 		portRangeMin:                start,
 		portRangeMax:                end,
 		persistence:                 persistence,
 		eosVersion:                  eosVersion,
-		ctx:                         ctx,
 	}
 
 	if err := ms.restoreVMs(); err != nil {
@@ -161,36 +150,30 @@ func (ms *managerService) CreateVM(ctx context.Context, req *CreateReq) (string,
 	cfg.Config.EnvMount = tmpEnvDir
 
 	if ms.qemuCfg.EnableSEVSNP || ms.qemuCfg.EnableSEV {
-		var stderrBuffer bytes.Buffer
-		options := []string{"--policy", "196608"}
-
-		if ms.pcrValuesFilePath != "" {
-			pcrValues := []string{"--pcr", ms.pcrValuesFilePath}
-			options = append(options, pcrValues...)
-		}
-
-		stderr := bufio.NewWriter(&stderrBuffer)
-
-		attestPolicyCmd, err := cmdconfig.NewCmdConfig("sudo", options, stderr)
-		if err != nil {
-			return "", id, err
-		}
+		cmd := exec.Command("sudo", fmt.Sprintf("%s/attestation_policy", ms.attestationPolicyBinaryPath), "--policy", "196608")
 
 		ms.ap.Lock()
-		stdOutByte, err := attestPolicyCmd.Run(ms.attestationPolicyBinaryPath)
+		_, err := cmd.Output()
 		ms.ap.Unlock()
 		if err != nil {
 			return "", id, errors.Wrap(ErrFailedToCreateAttestationPolicy, err)
 		}
 
-		attestationPolicy := attestation.Config{Config: &check.Config{RootOfTrust: &check.RootOfTrust{}, Policy: &check.Policy{}}, PcrConfig: &attestation.PcrConfig{}}
+		ms.ap.Lock()
+		f, err := os.ReadFile("./attestation_policy.json")
+		ms.ap.Unlock()
+		if err != nil {
+			return "", id, errors.Wrap(ErrFailedToReadPolicy, err)
+		}
 
-		if err = attestation.ReadAttestationPolicyFromByte(stdOutByte, &attestationPolicy); err != nil {
+		var attestationPolicy check.Config
+
+		if err = protojson.Unmarshal(f, &attestationPolicy); err != nil {
 			return "", id, errors.Wrap(ErrUnmarshalFailed, err)
 		}
 
 		// Define the TCB that was present at launch of the VM.
-		cfg.LaunchTCB = attestationPolicy.Config.Policy.MinimumLaunchTcb
+		cfg.LaunchTCB = attestationPolicy.Policy.MinimumLaunchTcb
 	}
 
 	agentPort, err := getFreePort(ms.portRangeMin, ms.portRangeMax)
@@ -218,10 +201,10 @@ func (ms *managerService) CreateVM(ctx context.Context, req *CreateReq) (string,
 	if cfg.Config.EnableSEVSNP {
 		todo := sha3.Sum256([]byte("TODO"))
 		// Define host-data value of QEMU for SEV-SNP, with a base64 encoding of the computation hash.
-		cfg.Config.SEVConfig.HostData = base64.StdEncoding.EncodeToString(todo[:])
+		cfg.Config.SevConfig.HostData = base64.StdEncoding.EncodeToString(todo[:])
 	}
 
-	cvm := ms.vmFactory(cfg, id, ms.logger)
+	cvm := ms.vmFactory(cfg, id)
 	if err = cvm.Start(); err != nil {
 		return "", id, err
 	}
@@ -229,24 +212,6 @@ func (ms *managerService) CreateVM(ctx context.Context, req *CreateReq) (string,
 	ms.vms[id] = cvm
 	ms.mu.Unlock()
 
-	if req.Ttl != "" {
-		ttl, err := time.ParseDuration(req.Ttl)
-		if err != nil {
-			return "", id, err
-		}
-
-		go func() {
-			select {
-			case <-time.After(ttl):
-				if err := ms.RemoveVM(ctx, id); err != nil {
-					ms.logger.Error("Failed to remove VM after TTL", "error", err)
-				}
-			case <-ms.ctx.Done():
-				return
-			}
-		}()
-	}
-
 	pid := cvm.GetProcess()
 
 	state := qemu.VMState{
@@ -286,7 +251,7 @@ func (ms *managerService) RemoveVM(ctx context.Context, computationID string) er
 	return nil
 }
 
-func (ms *managerService) ReturnCVMInfo(ctx context.Context) (string, int, string, string) {
+func (ms *managerService) ReturnSVMInfo(ctx context.Context) (string, int, string, string) {
 	return ms.qemuCfg.OVMFCodeConfig.Version, ms.qemuCfg.SMPCount, ms.qemuCfg.CPU, ms.eosVersion
 }
 
@@ -373,7 +338,7 @@ func (ms *managerService) restoreVMs() error {
 			continue
 		}
 
-		cvm := ms.vmFactory(state.VMinfo, state.ID, ms.logger)
+		cvm := ms.vmFactory(state.VMinfo, state.ID)
 
 		if err = cvm.SetProcess(state.PID); err != nil {
 			ms.logger.Warn("Failed to reattach to process", "computation", state.ID, "pid", state.PID, "error", err)
@@ -437,8 +402,6 @@ func tmpEnvironment(id string, req *CreateReq) (string, error) {
 	envMap := map[string]string{
 		agentLogLevelKey:   req.AgentLogLevel,
 		agentCvmGrpcUrlKey: req.AgentCvmServerUrl,
-		agentCvmId:         id,
-		agentCvmCaUrl:      req.AgentCvmCaUrl,
 	}
 
 	if req.AgentCvmClientCert != nil {

manager/service_test.go

@@ -9,7 +9,6 @@ import (
 	"net"
 	"os"
 	"os/exec"
-	"path"
 	"testing"
 
 	mglog "github.com/absmach/magistrala/logger"
@@ -30,7 +29,7 @@ func TestNew(t *testing.T) {
 	logger := slog.Default()
 	vmf := new(mocks.Provider)
 
-	service, err := New(context.Background(), cfg, "", "", "", logger, vmf.Execute, "")
+	service, err := New(cfg, "", logger, vmf.Execute, "")
 	require.NoError(t, err)
 
 	assert.NotNil(t, service)
@@ -95,8 +94,7 @@ func TestRun(t *testing.T) {
 
 			ms := &managerService{
 				qemuCfg:                     qemuCfg,
-				attestationPolicyBinaryPath: path.Join(tempDir, "attestation_policy"),
-				pcrValuesFilePath:           tempDir,
+				attestationPolicyBinaryPath: tempDir,
 				logger:                      logger,
 				vms:                         make(map[string]vm.VM),
 				vmFactory:                   vmf.Execute,

manager/tracing/tracing.go

@@ -42,9 +42,9 @@ func (tm *tracingMiddleware) FetchAttestationPolicy(ctx context.Context, computa
 	return tm.svc.FetchAttestationPolicy(ctx, computationId)
 }
 
-func (tm *tracingMiddleware) ReturnCVMInfo(ctx context.Context) (string, int, string, string) {
-	_, span := tm.tracer.Start(ctx, "return_cvm_info")
+func (tm *tracingMiddleware) ReturnSVMInfo(ctx context.Context) (string, int, string, string) {
+	_, span := tm.tracer.Start(ctx, "return_svm_info")
 	defer span.End()
 
-	return tm.svc.ReturnCVMInfo(ctx)
+	return tm.svc.ReturnSVMInfo(ctx)
 }

manager/vm/logging.go

@@ -1,81 +0,0 @@
-// Copyright (c) Ultraviolet
-// SPDX-License-Identifier: Apache-2.0
-package vm
-
-import (
-	"bytes"
-	"io"
-	"log/slog"
-	"strings"
-)
-
-var (
-	_ io.Writer = &Stdout{}
-	_ io.Writer = &Stderr{}
-)
-
-const bufSize = 1024
-
-type Stdout struct {
-	StateMachine StateMachine
-	Logger       *slog.Logger
-}
-
-// Write implements io.Writer.
-func (s *Stdout) Write(p []byte) (n int, err error) {
-	inBuf := bytes.NewBuffer(p)
-
-	buf := make([]byte, bufSize)
-
-	for {
-		n, err := inBuf.Read(buf)
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			return len(p) - inBuf.Len(), err
-		}
-
-		args := []any{
-			slog.String("state", s.StateMachine.State()),
-		}
-
-		s.Logger.Info(string(buf[:n]), args...)
-	}
-
-	return len(p), nil
-}
-
-type Stderr struct {
-	StateMachine StateMachine
-	Logger       *slog.Logger
-}
-
-// Write implements io.Writer.
-func (s *Stderr) Write(p []byte) (n int, err error) {
-	inBuf := bytes.NewBuffer(p)
-
-	buf := make([]byte, bufSize)
-
-	for {
-		n, err := inBuf.Read(buf)
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			return len(p) - inBuf.Len(), err
-		}
-
-		args := []any{
-			slog.String("state", s.StateMachine.State()),
-		}
-
-		if strings.Contains(string(buf[:n]), "Error") {
-			s.Logger.Error(string(buf[:n]), args...)
-		} else {
-			s.Logger.Warn(string(buf[:n]), args...)
-		}
-	}
-
-	return len(p), nil
-}

manager/vm/mocks/provider.go

@@ -1,15 +1,12 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0
 
-// Code generated by mockery v2.53.3. DO NOT EDIT.
+// Code generated by mockery v2.43.2. DO NOT EDIT.
 
 package mocks
 
 import (
-	slog "log/slog"
-
 	mock "github.com/stretchr/testify/mock"
-
 	vm "github.com/ultravioletrs/cocos/manager/vm"
 )
 
@@ -26,17 +23,17 @@ func (_m *Provider) EXPECT() *Provider_Expecter {
 	return &Provider_Expecter{mock: &_m.Mock}
 }
 
-// Execute provides a mock function with given fields: config, computationId, logger
-func (_m *Provider) Execute(config interface{}, computationId string, logger *slog.Logger) vm.VM {
-	ret := _m.Called(config, computationId, logger)
+// Execute provides a mock function with given fields: config, computationId
+func (_m *Provider) Execute(config interface{}, computationId string) vm.VM {
+	ret := _m.Called(config, computationId)
 
 	if len(ret) == 0 {
 		panic("no return value specified for Execute")
 	}
 
 	var r0 vm.VM
-	if rf, ok := ret.Get(0).(func(interface{}, string, *slog.Logger) vm.VM); ok {
-		r0 = rf(config, computationId, logger)
+	if rf, ok := ret.Get(0).(func(interface{}, string) vm.VM); ok {
+		r0 = rf(config, computationId)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).(vm.VM)
@@ -54,14 +51,13 @@ type Provider_Execute_Call struct {
 // Execute is a helper method to define mock.On call
 //   - config interface{}
 //   - computationId string
-//   - logger *slog.Logger
-func (_e *Provider_Expecter) Execute(config interface{}, computationId interface{}, logger interface{}) *Provider_Execute_Call {
-	return &Provider_Execute_Call{Call: _e.mock.On("Execute", config, computationId, logger)}
+func (_e *Provider_Expecter) Execute(config interface{}, computationId interface{}) *Provider_Execute_Call {
+	return &Provider_Execute_Call{Call: _e.mock.On("Execute", config, computationId)}
 }
 
-func (_c *Provider_Execute_Call) Run(run func(config interface{}, computationId string, logger *slog.Logger)) *Provider_Execute_Call {
+func (_c *Provider_Execute_Call) Run(run func(config interface{}, computationId string)) *Provider_Execute_Call {
 	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(interface{}), args[1].(string), args[2].(*slog.Logger))
+		run(args[0].(interface{}), args[1].(string))
 	})
 	return _c
 }
@@ -71,7 +67,7 @@ func (_c *Provider_Execute_Call) Return(_a0 vm.VM) *Provider_Execute_Call {
 	return _c
 }
 
-func (_c *Provider_Execute_Call) RunAndReturn(run func(interface{}, string, *slog.Logger) vm.VM) *Provider_Execute_Call {
+func (_c *Provider_Execute_Call) RunAndReturn(run func(interface{}, string) vm.VM) *Provider_Execute_Call {
 	_c.Call.Return(run)
 	return _c
 }

manager/vm/mocks/state_machine.go

@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0
 
-// Code generated by mockery v2.53.3. DO NOT EDIT.
+// Code generated by mockery v2.43.2. DO NOT EDIT.
 
 package mocks
 
@@ -23,7 +23,7 @@ func (_m *StateMachine) EXPECT() *StateMachine_Expecter {
 	return &StateMachine_Expecter{mock: &_m.Mock}
 }
 
-// State provides a mock function with no fields
+// State provides a mock function with given fields:
 func (_m *StateMachine) State() string {
 	ret := _m.Called()
 

manager/vm/mocks/vm.go

@@ -1,7 +1,7 @@
 // Copyright (c) Ultraviolet
 // SPDX-License-Identifier: Apache-2.0
 
-// Code generated by mockery v2.53.3. DO NOT EDIT.
+// Code generated by mockery v2.43.2. DO NOT EDIT.
 
 package mocks
 
@@ -25,7 +25,7 @@ func (_m *VM) EXPECT() *VM_Expecter {
 	return &VM_Expecter{mock: &_m.Mock}
 }
 
-// GetCID provides a mock function with no fields
+// GetCID provides a mock function with given fields:
 func (_m *VM) GetCID() int {
 	ret := _m.Called()
 
@@ -70,7 +70,7 @@ func (_c *VM_GetCID_Call) RunAndReturn(run func() int) *VM_GetCID_Call {
 	return _c
 }
 
-// GetConfig provides a mock function with no fields
+// GetConfig provides a mock function with given fields:
 func (_m *VM) GetConfig() interface{} {
 	ret := _m.Called()
 
@@ -117,7 +117,7 @@ func (_c *VM_GetConfig_Call) RunAndReturn(run func() interface{}) *VM_GetConfig_
 	return _c
 }
 
-// GetProcess provides a mock function with no fields
+// GetProcess provides a mock function with given fields:
 func (_m *VM) GetProcess() int {
 	ret := _m.Called()
 
@@ -254,7 +254,7 @@ func (_c *VM_SetProcess_Call) RunAndReturn(run func(int) error) *VM_SetProcess_C
 	return _c
 }
 
-// Start provides a mock function with no fields
+// Start provides a mock function with given fields:
 func (_m *VM) Start() error {
 	ret := _m.Called()
 
@@ -299,7 +299,7 @@ func (_c *VM_Start_Call) RunAndReturn(run func() error) *VM_Start_Call {
 	return _c
 }
 
-// State provides a mock function with no fields
+// State provides a mock function with given fields:
 func (_m *VM) State() string {
 	ret := _m.Called()
 
@@ -344,7 +344,7 @@ func (_c *VM_State_Call) RunAndReturn(run func() string) *VM_State_Call {
 	return _c
 }
 
-// Stop provides a mock function with no fields
+// Stop provides a mock function with given fields:
 func (_m *VM) Stop() error {
 	ret := _m.Called()
 

manager/vm/vm.go

@@ -3,8 +3,6 @@
 package vm
 
 import (
-	"log/slog"
-
 	"github.com/ultravioletrs/cocos/agent"
 	pkgmanager "github.com/ultravioletrs/cocos/pkg/manager"
 	"google.golang.org/protobuf/types/known/timestamppb"
@@ -23,7 +21,7 @@ type VM interface {
 	GetConfig() interface{}
 }
 
-type Provider func(config interface{}, computationId string, logger *slog.Logger) VM
+type Provider func(config interface{}, computationId string) VM
 
 type Event struct {
 	EventType     string

mockery.yml

@@ -41,6 +41,13 @@ packages:
           dir: "{{.InterfaceDir}}/mocks"
           filename: "state.go"
           mockname: "{{.InterfaceName}}"
+  github.com/ultravioletrs/cocos/internal/logger:
+    interfaces:
+      io.Writer:
+        config:
+          dir: "{{.InterfaceDir}}/mocks"
+          filename: "io_writer.go"
+          mockname: "{{.InterfaceName}}"
   github.com/ultravioletrs/cocos/internal/server:
     interfaces:
       Server:
@@ -93,29 +100,8 @@ packages:
           mockname: "{{.InterfaceName}}"
   github.com/ultravioletrs/cocos/agent/cvms/server:
     interfaces:
-      AgentServer:
+      AgentServerProvider:
         config:
           dir: "{{.InterfaceDir}}/mocks"
           filename: "server.go"
           mockname: "{{.InterfaceName}}"
-  github.com/ultravioletrs/cocos/agent/cvms/api/grpc/storage:
-    interfaces:
-      Storage:
-        config:
-          dir: "{{.InterfaceDir}}/mocks"
-          filename: "storage.go"
-          mockname: "{{.InterfaceName}}"
-  github.com/ultravioletrs/cocos/pkg/clients/grpc:
-    interfaces:
-      Client:
-        config:
-          dir: "{{.InterfaceDir}}/mocks"
-          filename: "client.go"
-          mockname: "{{.InterfaceName}}"
-  github.com/ultravioletrs/cocos/pkg/attestation:
-    interfaces:
-      Provider:
-        config:
-          dir: "{{.InterfaceDir}}/mocks"
-          filename: "attestation.go"
-          mockname: "{{.InterfaceName}}"

pkg/atls/atlsListener.go

@@ -5,15 +5,14 @@ package atls
 
 // #cgo LDFLAGS: -lssl -lcrypto
 // #include "extensions.h"
-// #include <string.h>
 import "C"
 
 import (
-	"crypto/sha3"
 	"fmt"
 	"io"
 	"net"
 	"os"
+	"runtime/cgo"
 	"strconv"
 	"sync"
 	"syscall"
@@ -21,10 +20,13 @@ import (
 	"unsafe"
 
 	"github.com/absmach/magistrala/pkg/errors"
-	"github.com/ultravioletrs/cocos/pkg/attestation"
-	"github.com/ultravioletrs/cocos/pkg/attestation/azure"
+	"github.com/ultravioletrs/cocos/agent"
 	"github.com/ultravioletrs/cocos/pkg/attestation/quoteprovider"
-	"github.com/ultravioletrs/cocos/pkg/attestation/vtpm"
+)
+
+const (
+	NoTee int = iota
+	AmdSevSnp
 )
 
 const (
@@ -35,7 +37,6 @@ const (
 	errorSyscall    = 5
 	errorSsl        = 1
 	waitTime        = 2
-	vmpl2           = 2
 )
 
 var (
@@ -50,42 +51,55 @@ var (
 	errConnCreate    = errors.New("could not create connection")
 )
 
-func formTeeData(pubKey []byte, teeNonce []byte) []byte {
-	combined := append(pubKey, teeNonce...)
-	sum := sha3.Sum512(combined)
-	return sum[:]
+type ValidationVerification func(data1, data2 []byte) error
+type FetchAttestation func(data1 []byte) ([]byte, error)
+
+func registerFetchAttestation(callback FetchAttestation) uintptr {
+	handle := cgo.NewHandle(callback)
+	return uintptr(handle)
 }
 
-func getPlatformProvider(platformType attestation.PlatformType, pubKey []byte) (attestation.Provider, error) {
-	switch platformType {
-	case attestation.SNPvTPM:
-		return vtpm.New(pubKey, true, vmpl2, nil), nil
-	case attestation.Azure:
-		return azure.New(nil), nil
+func registerValidationVerification(callback ValidationVerification) uintptr {
+	handle := cgo.NewHandle(callback)
+	return uintptr(handle)
+}
+
+//export validationVerificationCallback
+func validationVerificationCallback(teeType C.int) uintptr {
+	switch int(teeType) {
+	case NoTee:
+		return uintptr(0)
+	case AmdSevSnp:
+		return registerValidationVerification(quoteprovider.VerifyAttestationReportTLS)
 	default:
-		return nil, fmt.Errorf("unsupported platform type: %d", platformType)
+		return uintptr(0)
+	}
+}
+
+//export fetchAttestationCallback
+func fetchAttestationCallback(teeType C.int) uintptr {
+	switch int(teeType) {
+	case NoTee:
+		return uintptr(0)
+	case AmdSevSnp:
+		return registerFetchAttestation(quoteprovider.FetchAttestation)
+	default:
+		return uintptr(0)
 	}
 }
 
 //export callVerificationValidationCallback
-func callVerificationValidationCallback(platformType C.int, pubKey *C.uchar, pubKeyLen C.int, attestReport *C.uchar, attestReportSize C.int, teeNonceByte *C.uchar, vTPMNonceByte *C.uchar) C.int {
-	pubKeyCert := C.GoBytes(unsafe.Pointer(pubKey), pubKeyLen)
-	teeNonceData := C.GoBytes(unsafe.Pointer(teeNonceByte), quoteprovider.Nonce)
-	vTPMNonce := C.GoBytes(unsafe.Pointer(vTPMNonceByte), vtpm.Nonce)
-	pType := attestation.PlatformType(int(platformType))
-	attestationReport := C.GoBytes(unsafe.Pointer(attestReport), attestReportSize)
-	
-	teeData := formTeeData(pubKeyCert, teeNonceData)
+func callVerificationValidationCallback(callbackHandle uintptr, attReport *C.uchar, attReportSize C.int, repData *C.uchar) C.int {
+	handle := cgo.Handle(callbackHandle)
+	defer handle.Delete()
 
-	provider, err := getPlatformProvider(pType, pubKeyCert)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "no attestation provider found for platform type %s", err.Error())
-		return C.int(-1)
-	}
+	callback := handle.Value().(ValidationVerification)
+	attestationReport := C.GoBytes(unsafe.Pointer(attReport), attReportSize)
+	reportData := C.GoBytes(unsafe.Pointer(repData), agent.ReportDataSize)
 
-	err = provider.VerifyAttestation(attestationReport, teeData, vTPMNonce)
+	err := callback(attestationReport, reportData)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "verification callback failed %s", err.Error())
+		fmt.Fprintf(os.Stderr, "callback failed %v", err)
 		return C.int(-1)
 	}
 
@@ -93,27 +107,20 @@ func callVerificationValidationCallback(platformType C.int, pubKey *C.uchar, pub
 }
 
 //export callFetchAttestationCallback
-func callFetchAttestationCallback(platformType C.int, pubKey *C.uchar, pubKeyLen C.int, teeNonceByte *C.uchar, vTPMNonceByte *C.uchar, outlen *C.ulong) *C.uchar {
-	pubKeyCert := C.GoBytes(unsafe.Pointer(pubKey), pubKeyLen)
-	teeNonceData := C.GoBytes(unsafe.Pointer(teeNonceByte), quoteprovider.Nonce)
-	vTPMNonce := C.GoBytes(unsafe.Pointer(vTPMNonceByte), vtpm.Nonce)
-	pType := attestation.PlatformType(int(platformType))
+func callFetchAttestationCallback(callbackHandle uintptr, reportDataByte *C.uchar, outlen *C.int) *C.uchar {
+	handle := cgo.Handle(callbackHandle)
+	defer handle.Delete()
 
-	teeData := formTeeData(pubKeyCert, teeNonceData)
+	callback := handle.Value().(FetchAttestation)
+	reportData := C.GoBytes(unsafe.Pointer(reportDataByte), agent.ReportDataSize)
 
-	provider, err := getPlatformProvider(pType, pubKeyCert)
+	quote, err := callback(reportData)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "no attestation provider found for platform type %s", err.Error())
+		fmt.Fprintf(os.Stderr, "attestation callback returned nil")
 		return nil
 	}
 
-	quote, err := provider.Attestation(teeData, vTPMNonce)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "attestation callback returned nil: %s", err.Error())
-		return nil
-	}
-
-	*outlen = C.ulong(len(quote))
+	*outlen = C.int(len(quote))
 	resultC := C.malloc(C.size_t(len(quote)))
 	if resultC == nil {
 		fmt.Fprintf(os.Stderr, "could not allocate memory for fetch attestation callback")
@@ -125,11 +132,6 @@ func callFetchAttestationCallback(platformType C.int, pubKey *C.uchar, pubKeyLen
 	return (*C.uchar)(resultC)
 }
 
-//export returnCCPlatformType
-func returnCCPlatformType() int32 {
-	return int32(attestation.CCPlatform())
-}
-
 type ATLSServerListener struct {
 	tlsListener *C.tls_server_connection
 }
@@ -230,19 +232,19 @@ func (c *ATLSConn) Read(b []byte) (int, error) {
 	case noError:
 		return n, nil // no error.
 	case errorZeroReturn:
-		fmt.Fprintf(os.Stdout, "Connection closed by peer\n")
+		fmt.Fprintf(os.Stdout, "Connection closed by peer")
 		return 0, io.EOF // connection closed.
 	case errorWantRead:
-		fmt.Fprintf(os.Stderr, "Operation read incomplete, retry later\n")
+		fmt.Fprintf(os.Stderr, "Operation read incomplete, retry later")
 		return 0, nil // non-fatal, just retry later.
 	case errorWantWrite:
-		fmt.Fprintf(os.Stderr, "Operation write incomplete, retry later\n")
+		fmt.Fprintf(os.Stderr, "Operation write incomplete, retry later")
 		return 0, nil // non-fatal, just retry later.
 	case errorSyscall:
-		fmt.Fprintf(os.Stderr, "I/O error\n")
+		fmt.Fprintf(os.Stderr, "I/O error")
 		return 0, syscall.ECONNRESET // return connection reset error.
 	case errorSsl:
-		fmt.Fprintf(os.Stderr, "I/O error\n")
+		fmt.Fprintf(os.Stderr, "I/O error")
 		return 0, syscall.ECONNRESET // return connection reset error.
 	default:
 		fmt.Fprintf(os.Stderr, "SSL error occurred: %d\n", errCode)
@@ -295,7 +297,7 @@ func (c *ATLSConn) Close() error {
 			return errTLSConn
 		} else if int(ret) == 1 {
 			c.tlsConn = nil
-			break
+			break;
 		}
 	}
 

pkg/atls/extensions.c

@@ -7,28 +7,84 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-extern int callVerificationValidationCallback(int platformType, const u_char* pubKey, int pubKeyLen, const u_char* quote, int quoteSize, const u_char* teeNonceByte, const u_char* vTPMNonceByte);
-extern u_char* callFetchAttestationCallback(int platformType, const u_char* pubKey, int pubKeyLen, const u_char* teeNonceByte, const u_char* vTPMNonceByte, unsigned long* outlen);
+extern int callVerificationValidationCallback(uintptr_t callbackHandle, const u_char* attReport, int attReportSize, const u_char* repData);
+extern u_char* callFetchAttestationCallback(uintptr_t callbackHandle, const u_char* reportDataByte, int* outlen);
 extern uintptr_t validationVerificationCallback(int teeType);
-extern uintptr_t getPlatformTypeHandle(int platformType, u_char *teeNonce, u_char *vtpmNonce);
-extern int returnCCPlatformType();
+extern uintptr_t fetchAttestationCallback(int teeType);
 
-int triggerVerificationValidationCallback(int platformType, u_char* pub_key, int pub_key_len, u_char *quote, int quote_size, u_char *tee_nonce, u_char *vtpm_nonce) {
-    if (quote == NULL || vtpm_nonce == NULL || tee_nonce == NULL || pub_key == NULL) {
-        fprintf(stderr, "attestation and noce and public key cannot be NULL\n");
+int triggerVerificationValidationCallback(uintptr_t callbackHandle, u_char *attestationReport, int reportSize, u_char *reportData) {
+    if (attestationReport == NULL || reportData == NULL) {
+        fprintf(stderr, "attestation data and report data cannot be NULL\n");
         return -1;
     }
 
-    return callVerificationValidationCallback(platformType, pub_key, pub_key_len, quote, quote_size, tee_nonce, vtpm_nonce);
+
+    return callVerificationValidationCallback(callbackHandle, attestationReport, reportSize, reportData);
 }
 
-u_char* triggerFetchAttestationCallback(int platformType, u_char* pub_key, int pub_key_len, char *tee_nonce, char *vtpm_nonce, unsigned long *outlen) {
-    if(tee_nonce == NULL || vtpm_nonce == NULL) {
+u_char* triggerFetchAttestationCallback(uintptr_t callbackHandle, char *reportData) {
+    int outlen = REPORT_DATA_SIZE;
+
+    if(reportData == NULL) {
         fprintf(stderr, "Report data cannot be NULL");
         return NULL;
     }
 
-    return callFetchAttestationCallback(platformType, pub_key, pub_key_len, tee_nonce, vtpm_nonce, outlen);
+    return callFetchAttestationCallback(callbackHandle, reportData, &outlen);
+}
+
+int check_sev_snp() {
+    int fd = open(SEV_GUEST_DRIVER_PATH, O_RDONLY);
+
+    if (fd == -1) {
+        perror("Error opening /dev/sev-guest");
+        fprintf(stderr, "SEV guest driver is not available.\n");
+        return -1;
+    } else {
+        close(fd);
+    }
+
+    return 1;
+}
+
+int compute_sha256_of_public_key_nonce(X509 *cert, u_char *nonce, u_char *hash) {
+    EVP_PKEY *pkey = NULL;
+    u_char *pubkey_buf = NULL;
+    u_char *concatinated = NULL;
+    int pubkey_len = 0;
+    int totla_len = 0; 
+
+    pkey = X509_get_pubkey(cert);
+    if (pkey == NULL) {
+        fprintf(stderr, "Failed to extract public key from certificate\n");
+        return 0;
+    }
+
+    pubkey_len = i2d_PUBKEY(pkey, &pubkey_buf);
+    if (pubkey_len <= 0) {
+        fprintf(stderr, "Failed to convert public key to DER format\n");
+        EVP_PKEY_free(pkey);
+        return -1;
+    }
+    
+    totla_len = pubkey_len + CLIENT_RANDOM_SIZE;
+    concatinated = (u_char*)malloc(totla_len);
+    if (concatinated == NULL) {
+        perror("failed to allocate memory");
+        return -1;
+    }
+    memcpy(concatinated, nonce, CLIENT_RANDOM_SIZE);
+    memcpy(concatinated + CLIENT_RANDOM_SIZE, pubkey_buf, pubkey_len);
+
+    // Compute the SHA-512 hash of the DER-encoded public key and the random nonce
+    SHA512(concatinated, totla_len, hash);
+
+    // Clean up
+    EVP_PKEY_free(pkey);
+    OPENSSL_free(pubkey_buf);
+    free(concatinated);
+    
+    return 0;  // Success
 }
 
 /*
@@ -65,14 +121,9 @@ int evidence_request_ext_add_cb(SSL *s, unsigned int ext_type,
         }
 
         if (ext_data != NULL) {
-            if (RAND_bytes(ext_data->er.vtpm_nonce, NONCE_RANDOM_SIZE) != 1) {
-                perror("could not generate random bytes for vtpm nonce, will use SSL client random");
-                SSL_get_client_random(s, ext_data->er.vtpm_nonce, NONCE_RANDOM_SIZE);
-            }
-
-            if (RAND_bytes(ext_data->er.tee_nonce, REPORT_DATA_SIZE) != 1) {
-                perror("could not generate random bytes for tee nonce, will use SSL client random");
-                SSL_get_client_random(s, ext_data->er.tee_nonce, REPORT_DATA_SIZE);
+            if (RAND_bytes(ext_data->er.data, CLIENT_RANDOM_SIZE) != 1) {
+                perror("could not generate random bytes, will use SSL client random");
+                SSL_get_client_random(s, ext_data->er.data, CLIENT_RANDOM_SIZE);
             }
         } else {
             fprintf(stderr, "add_arg is NULL\n");
@@ -81,8 +132,9 @@ int evidence_request_ext_add_cb(SSL *s, unsigned int ext_type,
             return -1;
         }
 
-        memcpy(er->vtpm_nonce, ext_data->er.vtpm_nonce, NONCE_RANDOM_SIZE);
-        memcpy(er->tee_nonce, ext_data->er.tee_nonce, REPORT_DATA_SIZE);
+        memcpy(er->data, ext_data->er.data, CLIENT_RANDOM_SIZE);
+        er->tee_type = AMD_TEE;
+        ext_data->er.tee_type = AMD_TEE;
 
         *out = (const u_char *)er;
         *outlen = sizeof(evidence_request);
@@ -101,8 +153,19 @@ int evidence_request_ext_add_cb(SSL *s, unsigned int ext_type,
                 return -1;
             }
 
-            *platform_type = returnCCPlatformType();
-            ext_data->platform_type = *platform_type;
+            if (check_sev_snp() > 0) {
+                *platform_type = AMD_TEE; 
+            } else {
+                *platform_type = NO_TEE;
+            }
+
+            if ((*platform_type != ext_data->er.tee_type) || (*platform_type == NO_TEE)) {
+                *platform_type = NO_TEE;
+                ext_data->er.tee_type = NO_TEE;
+            } else {
+                ext_data->er.tee_type = AMD_TEE;
+                ext_data->fetch_attestation_handler = fetchAttestationCallback(ext_data->er.tee_type);
+            }
 
             *out = (u_char*)platform_type;
             *outlen = sizeof(int32_t);
@@ -138,8 +201,8 @@ int evidence_request_ext_parse_cb(SSL *s, unsigned int ext_type,
         evidence_request *er = (evidence_request*)in;
 
         if (ext_data != NULL) {
-            memcpy(ext_data->er.vtpm_nonce, er->vtpm_nonce, NONCE_RANDOM_SIZE);
-            memcpy(ext_data->er.tee_nonce, er->tee_nonce, REPORT_DATA_SIZE);
+            memcpy(ext_data->er.data, er->data, CLIENT_RANDOM_SIZE);
+            ext_data->er.tee_type = er->tee_type;
         } else {
             fprintf(stderr, "parse_arg is NULL\n");
             return 0;
@@ -148,11 +211,18 @@ int evidence_request_ext_parse_cb(SSL *s, unsigned int ext_type,
     }
     case SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS:
     {
-        int *platform_type = (int*)in;
+        int *tee_type = (int*)in;
         tls_extension_data *ext_data = (tls_extension_data*)parse_arg;
 
         if (ext_data != NULL) {
-            ext_data->platform_type = *platform_type;
+            ext_data->er.tee_type = *tee_type;
+
+            if (ext_data->er.tee_type != NO_TEE) {
+                ext_data->verification_validation_handler = validationVerificationCallback(ext_data->er.tee_type);
+            } else {
+                fprintf(stderr, "must use a TEE for aTLS\n");
+                return 0;
+            }
         } else {
             fprintf(stderr, "parse_arg is NULL\n");
             return 0;
@@ -168,7 +238,7 @@ int evidence_request_ext_parse_cb(SSL *s, unsigned int ext_type,
 /*
     Attestation Certificate extension
     - Contains the attestation report
-    - The attestation report contains the hash of the nonce, the Public Key of the x.509 Agent certificate, and the vTPM AK
+    - The attestation report contains the hash of the nonce and the Public Key of the x.509 Agent certificate
 */
 void  attestation_certificate_ext_free_cb(SSL *s, unsigned int ext_type,
                                     unsigned int context,
@@ -193,46 +263,40 @@ int attestation_certificate_ext_add_cb(SSL *s, unsigned int ext_type,
     {
         tls_extension_data *ext_data = (tls_extension_data*)add_arg;
         if (ext_data != NULL) {
-            u_char *quote;
-            size_t len = 0;
-            EVP_PKEY *pkey = NULL;
-            u_char *pubkey_buf = NULL;
-            int pubkey_len = 0;
-        
+            u_char *attestation_report;
+            u_char *hash = (u_char*)malloc(REPORT_DATA_SIZE*sizeof(u_char));
+
+            if (hash == NULL) {
+                perror("could not allocate memory");
+                *al = SSL_AD_INTERNAL_ERROR;
+                return -1;
+            }
 
             if (x != NULL) {
-                pkey = X509_get_pubkey(x);
-                if (pkey == NULL) {
-                    fprintf(stderr, "Failed to extract public key from certificate\n");
-                    return -1;
-                }
-            
-                pubkey_len = i2d_PUBKEY(pkey, &pubkey_buf);
-                if (pubkey_len <= 0) {
-                    fprintf(stderr, "Failed to convert public key to DER format\n");
-                    EVP_PKEY_free(pkey);
+                int ret = compute_sha256_of_public_key_nonce(x, ext_data->er.data, hash);
+                if (ret != 0) {
+                    fprintf(stderr, "error while calculating hash\n");
+                    free(hash);
+                    *al = SSL_AD_INTERNAL_ERROR;
                     return -1;
                 }
             } else {
                 fprintf(stderr, "agent certificate must be used for aTLS\n");
+                free(hash);
                 *al = SSL_AD_INTERNAL_ERROR;
                 return -1;
             }
 
-            quote = triggerFetchAttestationCallback(ext_data->platform_type, pubkey_buf, pubkey_len, ext_data->er.tee_nonce, ext_data->er.vtpm_nonce, &len);
-            if (quote == NULL) {
+            attestation_report = triggerFetchAttestationCallback(ext_data->fetch_attestation_handler, hash);
+            if (attestation_report == NULL) {
                 fprintf(stderr, "attestation report is NULL\n");
                 *al = SSL_AD_INTERNAL_ERROR;
-                EVP_PKEY_free(pkey);
-                OPENSSL_free(pubkey_buf);
                 return -1;
             }
+            free(hash);
 
-            EVP_PKEY_free(pkey);
-            OPENSSL_free(pubkey_buf);
-
-            *out = quote;
-            *outlen = len;
+            *out = attestation_report;
+            *outlen = ATTESTATION_REPORT_SIZE;
             return 1;
         } else {
             fprintf(stderr, "add_arg is NULL\n");
@@ -257,6 +321,7 @@ int  attestation_certificate_ext_parse_cb(SSL *s, unsigned int ext_type,
     switch (context)
     {
     case SSL_EXT_CLIENT_HELLO:
+        // Return 1 so the server can return the custom certificate extension.
         return 1;
     case SSL_EXT_TLS1_3_CERTIFICATE:
     {
@@ -264,41 +329,34 @@ int  attestation_certificate_ext_parse_cb(SSL *s, unsigned int ext_type,
             tls_extension_data *ext_data = (tls_extension_data*)parse_arg;
 
             if (ext_data != NULL) {
-                char *quote = (char*)malloc(inlen*sizeof(char));
-                EVP_PKEY *pkey = NULL;
-                u_char *pubkey_buf = NULL;
-                int pubkey_len = 0;
+                char *attestation_report = (char*)malloc(ATTESTATION_REPORT_SIZE*sizeof(char));
+                u_char *hash = (u_char*)malloc(REPORT_DATA_SIZE*sizeof(u_char));
                 int res = 0;
 
-                if (quote == NULL) {
+                if (hash == NULL || attestation_report == NULL) {
                     perror("could not allocate memory");
+
+                    if (hash != NULL) free(hash);
+                    if (attestation_report != NULL) free(attestation_report);
+
                     return 0;
                 }
 
-                pkey = X509_get_pubkey(x);
-                if (pkey == NULL) {
-                    fprintf(stderr, "Failed to extract public key from certificate\n");
-                    return -1;
+                if (compute_sha256_of_public_key_nonce(x, ext_data->er.data, hash) != 0) {
+                    fprintf(stderr, "calculating hash failed\n");
+                    free(attestation_report);
+                    free(hash);
+                    return 0;
                 }
-            
-                pubkey_len = i2d_PUBKEY(pkey, &pubkey_buf);
-                if (pubkey_len <= 0) {
-                    fprintf(stderr, "Failed to convert public key to DER format\n");
-                    EVP_PKEY_free(pkey);
-                    return -1;
-                }
-                memcpy(quote, in, inlen);
 
-                res = triggerVerificationValidationCallback(ext_data->platform_type,
-                                                    pubkey_buf,
-                                                    pubkey_len,
-                                                    quote,
-                                                    inlen,
-                                                    (u_char*)&ext_data->er.tee_nonce,
-                                                    (u_char*)&ext_data->er.vtpm_nonce);
-                free(quote);
-                EVP_PKEY_free(pkey);
-                OPENSSL_free(pubkey_buf);
+                memcpy(attestation_report, in, inlen);
+
+                res = triggerVerificationValidationCallback(ext_data->verification_validation_handler, 
+                                                    attestation_report,
+                                                    ATTESTATION_REPORT_SIZE,
+                                                    hash);
+                free(attestation_report);
+                free(hash);
                 
                 if (res != 0) {
                     fprintf(stderr, "verification and validation failed, aborting connection\n");

pkg/atls/extensions.h

@@ -6,31 +6,38 @@
 
 #define EVIDENCE_REQUEST_HELLO_EXTENSION_TYPE 65
 #define ATTESTATION_CERTIFICATE_EXTENSION_TYPE 66
+#define ATTESTATION_REPORT_SIZE 0x4A0
 #define REPORT_DATA_SIZE 64
-#define NONCE_RANDOM_SIZE 32
+#define CLIENT_RANDOM_SIZE 32
 #define TLS_CLIENT_CTX 0
 #define TLS_SERVER_CTX 1
 
+#define SEV_GUEST_DRIVER_PATH "/dev/sev-guest"
+#define NO_TEE 0
+#define AMD_TEE 1
+
 typedef struct evidence_request
 {
-    char vtpm_nonce[NONCE_RANDOM_SIZE];
-    char tee_nonce[REPORT_DATA_SIZE];
+    int tee_type;
+    char data[CLIENT_RANDOM_SIZE];
 } evidence_request;
 
 typedef struct tls_extension_data
 {
-    int platform_type;
+    uintptr_t fetch_attestation_handler;
+    uintptr_t verification_validation_handler;
     evidence_request er;
 } tls_extension_data;
 
 typedef struct tls_server_connection
 {
     int server_fd;
-    char* cert;
+    char* cert; 
     int cert_len;
     char* key;
     int key_len;
     struct sockaddr_storage addr;
+    uintptr_t fetch_attestation_handler;
 } tls_server_connection;
 
 typedef struct tls_connection
@@ -54,6 +61,7 @@ int set_socket_read_timeout(tls_connection* conn, int timeout_sec, int timeout_u
 int set_socket_write_timeout(tls_connection* conn, int timeout_sec, int timeout_usec);
 char* tls_return_addr(struct sockaddr_storage *addr);
 int tls_return_port(struct sockaddr_storage *addr);
+int compute_sha256_of_public_key(X509 *cert, unsigned char *hash);
 
 // Extensions
 void evidence_request_ext_free_cb(SSL *s, unsigned int ext_type,

pkg/atls/listener.c

@@ -289,8 +289,9 @@ tls_connection* tls_server_accept(tls_server_connection *tls_server) {
         goto cleanup_fd;
     }
 
-    // Set file descriptor
+    // Set file descriptor and assign handlers
     conn->socket_fd = client_fd;
+    conn->tls_ext_data.fetch_attestation_handler = tls_server->fetch_attestation_handler;
     SSL_set_fd(conn->ssl, client_fd);
 
     // Get local address

pkg/attestation/attestation.go

@@ -1,160 +0,0 @@
-// Copyright (c) Ultraviolet
-// SPDX-License-Identifier: Apache-2.0
-
-package attestation
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-
-	"github.com/absmach/magistrala/pkg/errors"
-	"github.com/google/go-sev-guest/client"
-	"github.com/google/go-sev-guest/proto/check"
-	"github.com/google/go-tpm/legacy/tpm2"
-	"google.golang.org/protobuf/encoding/protojson"
-)
-
-type PlatformType int
-
-const (
-	SNP PlatformType = iota
-	VTPM
-	SNPvTPM
-	AzureToken
-	Azure
-	NoCC
-)
-
-const (
-	azureMetadataUrl = "http://169.254.169.254/metadata/instance"
-	azureApiVersion  = "2021-02-01"
-)
-
-var (
-	AttestationPolicy           = Config{Config: &check.Config{Policy: &check.Policy{}, RootOfTrust: &check.RootOfTrust{}}, PcrConfig: &PcrConfig{}}
-	ErrAttestationPolicyOpen    = errors.New("failed to open Attestation Policy file")
-	ErrAttestationPolicyDecode  = errors.New("failed to decode Attestation Policy file")
-	ErrAttestationPolicyMissing = errors.New("failed due to missing Attestation Policy file")
-	ErrAttestationPolicyEncode  = errors.New("failed to encode the Attestation Policy")
-)
-
-type PcrValues struct {
-	Sha256 map[string]string `json:"sha256"`
-	Sha384 map[string]string `json:"sha384"`
-	Sha1   map[string]string `json:"sha1"`
-}
-
-type PcrConfig struct {
-	PCRValues PcrValues `json:"pcr_values"`
-}
-
-type Config struct {
-	*check.Config
-	*PcrConfig
-}
-
-type ccCheck struct {
-	checkFunc func() bool
-	platform  PlatformType
-}
-
-type Provider interface {
-	Attestation(teeNonce []byte, vTpmNonce []byte) ([]byte, error)
-	TeeAttestation(teeNonce []byte) ([]byte, error)
-	VTpmAttestation(vTpmNonce []byte) ([]byte, error)
-	VerifyAttestation(report []byte, teeNonce []byte, vTpmNonce []byte) error
-	VerifTeeAttestation(report []byte, teeNonce []byte) error
-	VerifVTpmAttestation(report []byte, vTpmNonce []byte) error
-	AzureAttestationToken(tokenNonce []byte) ([]byte, error)
-}
-
-func ReadAttestationPolicy(policyPath string, attestationConfiguration *Config) error {
-	if policyPath != "" {
-		policyData, err := os.ReadFile(policyPath)
-		if err != nil {
-			return errors.Wrap(ErrAttestationPolicyOpen, err)
-		}
-
-		return ReadAttestationPolicyFromByte(policyData, attestationConfiguration)
-	}
-
-	return ErrAttestationPolicyMissing
-}
-
-func ReadAttestationPolicyFromByte(policyData []byte, attestationConfiguration *Config) error {
-	unmarshalOptions := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true}
-
-	if err := unmarshalOptions.Unmarshal(policyData, attestationConfiguration.Config); err != nil {
-		return errors.Wrap(ErrAttestationPolicyDecode, err)
-	}
-
-	if err := json.Unmarshal(policyData, attestationConfiguration.PcrConfig); err != nil {
-		return errors.Wrap(ErrAttestationPolicyDecode, err)
-	}
-
-	return nil
-}
-
-// CCPlatform returns the type of the confidential computing platform.
-func CCPlatform() PlatformType {
-	checks := []ccCheck{
-		{SevGuestvTPMExists, SNPvTPM},
-		{SevGuesDeviceExists, SNP},
-		{isAzureVM, Azure},
-	}
-
-	for _, c := range checks {
-		if c.checkFunc() {
-			return c.platform
-		}
-	}
-	return NoCC
-}
-
-func SevGuesDeviceExists() bool {
-	d, err := client.OpenDevice()
-	if err != nil {
-		return false
-	}
-	d.Close()
-
-	return true
-}
-
-func SevGuestvTPMExists() bool {
-	d, err := tpm2.OpenTPM()
-	if err != nil {
-		return false
-	}
-	d.Close()
-
-	return SevGuesDeviceExists()
-}
-
-func isAzureVM() bool {
-	client := &http.Client{}
-	url := fmt.Sprintf("%s?api-version=%s", azureMetadataUrl, azureApiVersion)
-
-	req, _ := http.NewRequest("GET", url, nil)
-	req.Header.Add("Metadata", "true")
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return false
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode == http.StatusOK {
-		body, err := io.ReadAll(resp.Body)
-		if err != nil {
-			return false
-		}
-
-		return len(body) > 0
-	}
-
-	return false
-}

pkg/attestation/azure/azure.go

@@ -1,43 +0,0 @@
-// Copyright (c) Ultraviolet
-// SPDX-License-Identifier: Apache-2.0
-
-package azure
-
-import (
-	"github.com/edgelesssys/go-azguestattestation/maa"
-)
-
-type EnvConfig struct {
-	OSBuild  string
-	OSType   string
-	OSDistro string
-	MaaURL   string
-}
-
-func NewEnvConfigFromAgent(agentOSBuild, agentOSType, agentOSDistro, maaURL string) *EnvConfig {
-	return &EnvConfig{
-		OSBuild:  agentOSBuild,
-		OSType:   agentOSType,
-		OSDistro: agentOSDistro,
-		MaaURL:   maaURL,
-	}
-}
-
-func InitializeDefaultMAAVars(config *EnvConfig) {
-	maa.OSBuild = config.OSBuild
-	maa.OSType = config.OSType
-	maa.OSDistro = config.OSDistro
-	MaaURL = config.MaaURL
-}
-
-func (c *EnvConfig) InitializeOSVars(build, osType, osDistro string) {
-	if build != "" {
-		c.OSBuild = build
-	}
-	if osType != "" {
-		c.OSType = osType
-	}
-	if osDistro != "" {
-		c.OSDistro = osDistro
-	}
-}