diff --git a/api/api.pb.go b/api/api.pb.go index 5b171c8..c8e099d 100644 --- a/api/api.pb.go +++ b/api/api.pb.go @@ -15,8 +15,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 -// protoc v3.20.1 +// protoc-gen-go v1.32.0 +// protoc v3.21.12 // source: api.proto package api @@ -83,17 +83,14 @@ func (ErrorCode) EnumDescriptor() ([]byte, []int) { return file_api_proto_rawDescGZIP(), []int{0} } +// AppletUpdate // +// A `AppletUpdate` represents an OTA sequence applet slice. // -//AppletUpdate -// -//A `AppletUpdate` represents an OTA sequence applet slice. -// -//The `TotalChunks` value indicates the total number of chunks for the update, -//`Seq` is the transmitted AppletUpdate chunk number: -//- `0` indicates that the struct contains verification data in `Header`. -//- `1` onwards identifies the first, second, ... chunk of firmware image data. -// +// The `TotalChunks` value indicates the total number of chunks for the update, +// `Seq` is the transmitted AppletUpdate chunk number: +// - `0` indicates that the struct contains verification data in `Header`. +// - `1` onwards identifies the first, second, ... chunk of firmware image data. type AppletUpdate struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -102,6 +99,7 @@ type AppletUpdate struct { Total uint32 `protobuf:"varint,1,opt,name=Total,proto3" json:"Total,omitempty"` Seq uint32 `protobuf:"varint,2,opt,name=Seq,proto3" json:"Seq,omitempty"` // Types that are assignable to Payload: + // // *AppletUpdate_Data // *AppletUpdate_Header Payload isAppletUpdate_Payload `protobuf_oneof:"Payload"` @@ -276,13 +274,10 @@ func (x *AppletUpdateHeader) GetLogIndex() uint64 { return 0 } +// Status information // -// -//Status information -// -//The status information format is returned on any message sent with the -//`U2FHID_ARMORY_INF` vendor specific command. -// +// The status information format is returned on any message sent with the +// `U2FHID_ARMORY_INF` vendor specific command. type Status struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -396,13 +391,10 @@ func (x *Status) GetIdentityCounter() uint32 { return 0 } +// WitnessStatus contains witness-applet specific status information. // -// -//WitnessStatus contains witness-applet specific status information. -// -//This is embedded in the general Status message if the applet has provided -//this information to the OS. -// +// This is embedded in the general Status message if the applet has provided +// this information to the OS. type WitnessStatus struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/go.mod b/go.mod index 99dcc57..25bce3c 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/flynn/u2f v0.0.0-20180613185708-15554eb68e5d github.com/gsora/fidati v0.0.0-20220824075547-eeb0a5f7d6c3 github.com/transparency-dev/armored-witness-boot v0.0.0-20230904140406-e2e16c7665b7 - github.com/transparency-dev/armored-witness-common v0.0.0-20240213103302-b71051a8c4c0 + github.com/transparency-dev/armored-witness-common v0.0.0-20240220112235-78461719cb5e github.com/transparency-dev/merkle v0.0.2 github.com/transparency-dev/serverless-log v0.0.0-20231215122707-66f68a7705f5 github.com/usbarmory/GoTEE v0.0.0-20230914094934-f4f769daa5a9 diff --git a/go.sum b/go.sum index a354b20..2338b96 100644 --- a/go.sum +++ b/go.sum @@ -58,6 +58,8 @@ github.com/transparency-dev/armored-witness-boot v0.0.0-20230904140406-e2e16c766 github.com/transparency-dev/armored-witness-boot v0.0.0-20230904140406-e2e16c7665b7/go.mod h1:GTj2zM9nwFe7G7gaXzIbkKJ/PkZfvVq4TdNiA6CBsdo= github.com/transparency-dev/armored-witness-common v0.0.0-20240213103302-b71051a8c4c0 h1:lZCUkdfCEi3WhAcky5I79xIKUGNVdfIL554ypOj3ZSQ= github.com/transparency-dev/armored-witness-common v0.0.0-20240213103302-b71051a8c4c0/go.mod h1:C9yCS1hFbmS/yngGXgL+YM098g/KMqAIF1Oh6QV+7+k= +github.com/transparency-dev/armored-witness-common v0.0.0-20240220112235-78461719cb5e h1:BkbNlj9zwL+z15vb2kDGnW9sCLKaa+XC+Ms4a8Nmhq8= +github.com/transparency-dev/armored-witness-common v0.0.0-20240220112235-78461719cb5e/go.mod h1:C9yCS1hFbmS/yngGXgL+YM098g/KMqAIF1Oh6QV+7+k= github.com/transparency-dev/formats v0.0.0-20230920083814-0f75b1d4e813 h1:PHklaeYyhPsbhWt+MnKpBvJrsJGkPEaU1JutMj4wNqM= github.com/transparency-dev/formats v0.0.0-20230920083814-0f75b1d4e813/go.mod h1:J2NdDb6IhKIvF6MwCvKikz9/QStRylEtS2mv+En+jBg= github.com/transparency-dev/merkle v0.0.2 h1:Q9nBoQcZcgPamMkGn7ghV8XiTZ/kRxn1yCG81+twTK4= diff --git a/trusted_os/main.go b/trusted_os/main.go index deae77b..663e6ed 100644 --- a/trusted_os/main.go +++ b/trusted_os/main.go @@ -217,7 +217,7 @@ func main() { if err != nil { log.Printf("SM applet verification error, %v", err) } - loadedAppletVersion = manifest.GitTagName + loadedAppletVersion = manifest.Git.TagName log.Printf("SM Loaded applet version %s", loadedAppletVersion.String()) usbarmory.LED("white", true)