Move identity counter out of WitnessStatus.

transparency-dev · Jan 30, 2024 · f4c9324 · f4c9324
1 parent ad2ae61
commit f4c9324
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 26 deletions.
diff --git a/api/api.go b/api/api.go
@@ -98,10 +98,10 @@ func (p *Status) Print() string {
 	status.WriteString(fmt.Sprintf("Version ....................: %d (%s)\n", p.Version, time.Unix(int64(p.Version), 0)))
 	status.WriteString(fmt.Sprintf("Runtime ....................: %s\n", p.Runtime))
 	status.WriteString(fmt.Sprintf("Link .......................: %v\n", p.Link))
+	status.WriteString(fmt.Sprintf("IdentityCounter ............: %d", p.IdentityCounter))
 	if p.Witness != nil {
 		status.WriteString(fmt.Sprintf("Witness/Identity ...........: %v\n", p.Witness.Identity))
 		status.WriteString(fmt.Sprintf("Witness/IP .................: %v", p.Witness.IP))
-		status.WriteString(fmt.Sprintf("Witness/IdentityCounter ....: %d", p.Witness.IdentityCounter))
 	} else {
 		status.WriteString(fmt.Sprint("Witness ....................: <no status>"))
 	}

diff --git a/api/api.pb.go b/api/api.pb.go
diff --git a/api/api.proto b/api/api.proto
@@ -129,6 +129,9 @@ message Status {
   string Runtime = 6;
   bool Link = 7;
   WitnessStatus Witness = 8;
+  // IdentityCounter is incremented when the device is recovered and the device
+  // needs a new witness identity.
+  uint32 IdentityCounter = 9;
 }
 
 /*
@@ -145,9 +148,6 @@ message WitnessStatus {
   string Identity = 1;
   // IP is a string representation of the witness applet's current IP address.
   string IP = 2;
-  // IdentityCounter is incremented when the device is recovered and the device
-  // needs a new witness identity.
-  uint32 IdentityCounter = 3;
 }
 
 /*

diff --git a/api/rpc/rpc.go b/api/rpc/rpc.go
@@ -49,9 +49,6 @@ type WitnessStatus struct {
 	Identity string
 	// IP is the currently-assigned IP address of the witness applet.
 	IP string
-	// IdentityCounter is incremented when the device is recovered and the device
-	// needs a new witness identity.
-	IdentityCounter uint32
 }
 
 // FirmwareUpdate represents a firmware update.

diff --git a/trusted_os/ctl.go b/trusted_os/ctl.go
@@ -61,6 +61,7 @@ func getStatus() (s *api.Status) {
 		Build:    Build,
 		Version:  version,
 		Runtime:  fmt.Sprintf("%s %s/%s", runtime.Version(), runtime.GOOS, runtime.GOARCH),
+		// TODO(jayhou): set IdentityCounter here.
 	}
 	if witnessStatus != nil {
 		s.Witness = &api.WitnessStatus{