From f033c0b400e1231686c1016b4337719ad5d6ca97 Mon Sep 17 00:00:00 2001 From: Dionna Glaze Date: Tue, 9 Jul 2024 14:56:22 +0000 Subject: [PATCH] Update protoc github action and regenerate. --- .github/workflows/ci.yml | 4 +-- proto/check/check.pb.go | 64 ++++++++++++++++++------------------- proto/fakekds/fakekds.pb.go | 2 +- proto/sevsnp/sevsnp.pb.go | 12 +++---- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d3d594..4cd4941 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,10 +39,10 @@ jobs: with: go-version: ${{ matrix.go-version }} - name: Install Protoc - uses: arduino/setup-protoc@v1 + uses: arduino/setup-protoc@v3 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - version: "3.12.4" + version: "27.2" - name: Install protoc-gen-go run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31.0 - name: Check Protobuf Generation diff --git a/proto/check/check.pb.go b/proto/check/check.pb.go index 4735f0e..50d5649 100644 --- a/proto/check/check.pb.go +++ b/proto/check/check.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.31.0 -// protoc v3.12.4 +// protoc v5.27.2 // source: check.proto // Package check represents an attestation validation policy. @@ -23,10 +23,10 @@ package check import ( - wrappers "github.com/golang/protobuf/ptypes/wrappers" sevsnp "github.com/google/go-sev-guest/proto/sevsnp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -49,28 +49,28 @@ type Policy struct { MinimumGuestSvn uint32 `protobuf:"varint,1,opt,name=minimum_guest_svn,json=minimumGuestSvn,proto3" json:"minimum_guest_svn,omitempty"` // The component-wise maximum permissible guest policy, except // API version values, and SingleSocket are the minimum permissible. - Policy uint64 `protobuf:"varint,2,opt,name=policy,proto3" json:"policy,omitempty"` - FamilyId []byte `protobuf:"bytes,3,opt,name=family_id,json=familyId,proto3" json:"family_id,omitempty"` // Should be 16 bytes long - ImageId []byte `protobuf:"bytes,4,opt,name=image_id,json=imageId,proto3" json:"image_id,omitempty"` // Should be 16 bytes long - Vmpl *wrappers.UInt32Value `protobuf:"bytes,5,opt,name=vmpl,proto3" json:"vmpl,omitempty"` - MinimumTcb uint64 `protobuf:"varint,6,opt,name=minimum_tcb,json=minimumTcb,proto3" json:"minimum_tcb,omitempty"` - MinimumLaunchTcb uint64 `protobuf:"varint,7,opt,name=minimum_launch_tcb,json=minimumLaunchTcb,proto3" json:"minimum_launch_tcb,omitempty"` - PlatformInfo *wrappers.UInt64Value `protobuf:"bytes,8,opt,name=platform_info,json=platformInfo,proto3" json:"platform_info,omitempty"` - RequireAuthorKey bool `protobuf:"varint,9,opt,name=require_author_key,json=requireAuthorKey,proto3" json:"require_author_key,omitempty"` - ReportData []byte `protobuf:"bytes,10,opt,name=report_data,json=reportData,proto3" json:"report_data,omitempty"` // Should be 64 bytes long - Measurement []byte `protobuf:"bytes,11,opt,name=measurement,proto3" json:"measurement,omitempty"` // Should be 48 bytes long - HostData []byte `protobuf:"bytes,12,opt,name=host_data,json=hostData,proto3" json:"host_data,omitempty"` // Should be 32 bytes long - ReportId []byte `protobuf:"bytes,13,opt,name=report_id,json=reportId,proto3" json:"report_id,omitempty"` // Should be 32 bytes long - ReportIdMa []byte `protobuf:"bytes,14,opt,name=report_id_ma,json=reportIdMa,proto3" json:"report_id_ma,omitempty"` // Should be 32 bytes long - ChipId []byte `protobuf:"bytes,15,opt,name=chip_id,json=chipId,proto3" json:"chip_id,omitempty"` // Should be 64 bytes long - MinimumBuild uint32 `protobuf:"varint,16,opt,name=minimum_build,json=minimumBuild,proto3" json:"minimum_build,omitempty"` - MinimumVersion string `protobuf:"bytes,17,opt,name=minimum_version,json=minimumVersion,proto3" json:"minimum_version,omitempty"` // Should be "maj.min", both should be 0-255. - PermitProvisionalFirmware bool `protobuf:"varint,18,opt,name=permit_provisional_firmware,json=permitProvisionalFirmware,proto3" json:"permit_provisional_firmware,omitempty"` - RequireIdBlock bool `protobuf:"varint,19,opt,name=require_id_block,json=requireIdBlock,proto3" json:"require_id_block,omitempty"` - TrustedAuthorKeys [][]byte `protobuf:"bytes,20,rep,name=trusted_author_keys,json=trustedAuthorKeys,proto3" json:"trusted_author_keys,omitempty"` - TrustedAuthorKeyHashes [][]byte `protobuf:"bytes,21,rep,name=trusted_author_key_hashes,json=trustedAuthorKeyHashes,proto3" json:"trusted_author_key_hashes,omitempty"` - TrustedIdKeys [][]byte `protobuf:"bytes,22,rep,name=trusted_id_keys,json=trustedIdKeys,proto3" json:"trusted_id_keys,omitempty"` - TrustedIdKeyHashes [][]byte `protobuf:"bytes,23,rep,name=trusted_id_key_hashes,json=trustedIdKeyHashes,proto3" json:"trusted_id_key_hashes,omitempty"` + Policy uint64 `protobuf:"varint,2,opt,name=policy,proto3" json:"policy,omitempty"` + FamilyId []byte `protobuf:"bytes,3,opt,name=family_id,json=familyId,proto3" json:"family_id,omitempty"` // Should be 16 bytes long + ImageId []byte `protobuf:"bytes,4,opt,name=image_id,json=imageId,proto3" json:"image_id,omitempty"` // Should be 16 bytes long + Vmpl *wrapperspb.UInt32Value `protobuf:"bytes,5,opt,name=vmpl,proto3" json:"vmpl,omitempty"` + MinimumTcb uint64 `protobuf:"varint,6,opt,name=minimum_tcb,json=minimumTcb,proto3" json:"minimum_tcb,omitempty"` + MinimumLaunchTcb uint64 `protobuf:"varint,7,opt,name=minimum_launch_tcb,json=minimumLaunchTcb,proto3" json:"minimum_launch_tcb,omitempty"` + PlatformInfo *wrapperspb.UInt64Value `protobuf:"bytes,8,opt,name=platform_info,json=platformInfo,proto3" json:"platform_info,omitempty"` + RequireAuthorKey bool `protobuf:"varint,9,opt,name=require_author_key,json=requireAuthorKey,proto3" json:"require_author_key,omitempty"` + ReportData []byte `protobuf:"bytes,10,opt,name=report_data,json=reportData,proto3" json:"report_data,omitempty"` // Should be 64 bytes long + Measurement []byte `protobuf:"bytes,11,opt,name=measurement,proto3" json:"measurement,omitempty"` // Should be 48 bytes long + HostData []byte `protobuf:"bytes,12,opt,name=host_data,json=hostData,proto3" json:"host_data,omitempty"` // Should be 32 bytes long + ReportId []byte `protobuf:"bytes,13,opt,name=report_id,json=reportId,proto3" json:"report_id,omitempty"` // Should be 32 bytes long + ReportIdMa []byte `protobuf:"bytes,14,opt,name=report_id_ma,json=reportIdMa,proto3" json:"report_id_ma,omitempty"` // Should be 32 bytes long + ChipId []byte `protobuf:"bytes,15,opt,name=chip_id,json=chipId,proto3" json:"chip_id,omitempty"` // Should be 64 bytes long + MinimumBuild uint32 `protobuf:"varint,16,opt,name=minimum_build,json=minimumBuild,proto3" json:"minimum_build,omitempty"` + MinimumVersion string `protobuf:"bytes,17,opt,name=minimum_version,json=minimumVersion,proto3" json:"minimum_version,omitempty"` // Should be "maj.min", both should be 0-255. + PermitProvisionalFirmware bool `protobuf:"varint,18,opt,name=permit_provisional_firmware,json=permitProvisionalFirmware,proto3" json:"permit_provisional_firmware,omitempty"` + RequireIdBlock bool `protobuf:"varint,19,opt,name=require_id_block,json=requireIdBlock,proto3" json:"require_id_block,omitempty"` + TrustedAuthorKeys [][]byte `protobuf:"bytes,20,rep,name=trusted_author_keys,json=trustedAuthorKeys,proto3" json:"trusted_author_keys,omitempty"` + TrustedAuthorKeyHashes [][]byte `protobuf:"bytes,21,rep,name=trusted_author_key_hashes,json=trustedAuthorKeyHashes,proto3" json:"trusted_author_key_hashes,omitempty"` + TrustedIdKeys [][]byte `protobuf:"bytes,22,rep,name=trusted_id_keys,json=trustedIdKeys,proto3" json:"trusted_id_keys,omitempty"` + TrustedIdKeyHashes [][]byte `protobuf:"bytes,23,rep,name=trusted_id_key_hashes,json=trustedIdKeyHashes,proto3" json:"trusted_id_key_hashes,omitempty"` // The expected product that generated the attestation report. Stepping optional. Product *sevsnp.SevProduct `protobuf:"bytes,24,opt,name=product,proto3" json:"product,omitempty"` } @@ -135,7 +135,7 @@ func (x *Policy) GetImageId() []byte { return nil } -func (x *Policy) GetVmpl() *wrappers.UInt32Value { +func (x *Policy) GetVmpl() *wrapperspb.UInt32Value { if x != nil { return x.Vmpl } @@ -156,7 +156,7 @@ func (x *Policy) GetMinimumLaunchTcb() uint64 { return 0 } -func (x *Policy) GetPlatformInfo() *wrappers.UInt64Value { +func (x *Policy) GetPlatformInfo() *wrapperspb.UInt64Value { if x != nil { return x.PlatformInfo } @@ -547,12 +547,12 @@ func file_check_proto_rawDescGZIP() []byte { var file_check_proto_msgTypes = make([]protoimpl.MessageInfo, 3) var file_check_proto_goTypes = []interface{}{ - (*Policy)(nil), // 0: check.Policy - (*RootOfTrust)(nil), // 1: check.RootOfTrust - (*Config)(nil), // 2: check.Config - (*wrappers.UInt32Value)(nil), // 3: google.protobuf.UInt32Value - (*wrappers.UInt64Value)(nil), // 4: google.protobuf.UInt64Value - (*sevsnp.SevProduct)(nil), // 5: sevsnp.SevProduct + (*Policy)(nil), // 0: check.Policy + (*RootOfTrust)(nil), // 1: check.RootOfTrust + (*Config)(nil), // 2: check.Config + (*wrapperspb.UInt32Value)(nil), // 3: google.protobuf.UInt32Value + (*wrapperspb.UInt64Value)(nil), // 4: google.protobuf.UInt64Value + (*sevsnp.SevProduct)(nil), // 5: sevsnp.SevProduct } var file_check_proto_depIdxs = []int32{ 3, // 0: check.Policy.vmpl:type_name -> google.protobuf.UInt32Value diff --git a/proto/fakekds/fakekds.pb.go b/proto/fakekds/fakekds.pb.go index f3e2501..073ff73 100644 --- a/proto/fakekds/fakekds.pb.go +++ b/proto/fakekds/fakekds.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.31.0 -// protoc v3.12.4 +// protoc v5.27.2 // source: fakekds.proto package fakekds diff --git a/proto/sevsnp/sevsnp.pb.go b/proto/sevsnp/sevsnp.pb.go index 6de069d..9fddc18 100644 --- a/proto/sevsnp/sevsnp.pb.go +++ b/proto/sevsnp/sevsnp.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.31.0 -// protoc v3.12.4 +// protoc v5.27.2 // source: sevsnp.proto // Package sevsnp represents an SEV-SNP attestation report and its certificate @@ -24,9 +24,9 @@ package sevsnp import ( - wrappers "github.com/golang/protobuf/ptypes/wrappers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -465,8 +465,8 @@ type SevProduct struct { Name SevProduct_SevProductName `protobuf:"varint,1,opt,name=name,proto3,enum=sevsnp.SevProduct_SevProductName" json:"name,omitempty"` // Deprecated: Marked as deprecated in sevsnp.proto. - Stepping uint32 `protobuf:"varint,2,opt,name=stepping,proto3" json:"stepping,omitempty"` // Must be a 4-bit number - MachineStepping *wrappers.UInt32Value `protobuf:"bytes,3,opt,name=machine_stepping,json=machineStepping,proto3" json:"machine_stepping,omitempty"` + Stepping uint32 `protobuf:"varint,2,opt,name=stepping,proto3" json:"stepping,omitempty"` // Must be a 4-bit number + MachineStepping *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=machine_stepping,json=machineStepping,proto3" json:"machine_stepping,omitempty"` } func (x *SevProduct) Reset() { @@ -516,7 +516,7 @@ func (x *SevProduct) GetStepping() uint32 { return 0 } -func (x *SevProduct) GetMachineStepping() *wrappers.UInt32Value { +func (x *SevProduct) GetMachineStepping() *wrapperspb.UInt32Value { if x != nil { return x.MachineStepping } @@ -724,7 +724,7 @@ var file_sevsnp_proto_goTypes = []interface{}{ (*SevProduct)(nil), // 3: sevsnp.SevProduct (*Attestation)(nil), // 4: sevsnp.Attestation nil, // 5: sevsnp.CertificateChain.ExtrasEntry - (*wrappers.UInt32Value)(nil), // 6: google.protobuf.UInt32Value + (*wrapperspb.UInt32Value)(nil), // 6: google.protobuf.UInt32Value } var file_sevsnp_proto_depIdxs = []int32{ 5, // 0: sevsnp.CertificateChain.extras:type_name -> sevsnp.CertificateChain.ExtrasEntry