Rename appbins latest -> current

- Latest() -> Current()
- latestAppHash -> currentAppHash

Author: mchack-work

cmd/tkey-verification/appbins.go

@@ -30,8 +30,8 @@ func (a *AppBin) Hash() []byte {
 }
 
 type AppBins struct {
-	Bins   map[string]AppBin
-	latest string
+	Bins    map[string]AppBin
+	current string
 }
 
 // Get returns an AppBin indexed by the app hash digest.
@@ -60,10 +60,10 @@ func (a AppBins) Tags() []string {
 	return tags
 }
 
-// Latest returns the currently used device app for device signing
+// Current returns the currently used device app for device signing
 // during provisioning.
-func (a AppBins) Latest() AppBin {
-	return a.Bins[a.latest]
+func (a AppBins) Current() AppBin {
+	return a.Bins[a.current]
 }
 
 // NewAppBins initializes the embedded device apps. It expects the
@@ -127,7 +127,7 @@ func NewAppBins(latestHash string) (AppBins, error) {
 	}
 
 	if _, ok := appBins.Bins[latestHash]; ok {
-		appBins.latest = latestHash
+		appBins.current = latestHash
 	} else {
 		return AppBins{}, MissingError{what: "latest app"}
 	}

cmd/tkey-verification/main.go

@@ -17,7 +17,7 @@ const currentVendorHash = "f8ecdcda53a296636a0297c250b27fb649860645626cc8ad935ea
 
 // Hash digest of signing device app for device signature during
 // provisioning.
-const latestAppHash = "cd3c4f433f84648428113bd0a0cc407b2150e925a51b478006321e5a903c1638ce807138d1cc1f8f03cfb6236a87de0febde3ce0ddf177208e5483d1c169bac4"
+const currentAppHash = "cd3c4f433f84648428113bd0a0cc407b2150e925a51b478006321e5a903c1638ce807138d1cc1f8f03cfb6236a87de0febde3ce0ddf177208e5483d1c169bac4"
 
 const progname = "tkey-verification"
 

cmd/tkey-verification/remotesign.go

@@ -33,13 +33,13 @@ func remoteSign(server *Server, devPath string, verbose bool) {
 // Returns the currently used device app, UDI, pubkey, expected
 // firmware, and any error
 func signChallenge(devPath string, verbose bool) (AppBin, *tkey.UDI, []byte, Firmware, error) {
-	appBins, err := NewAppBins(latestAppHash)
+	appBins, err := NewAppBins(currentAppHash)
 	if err != nil {
 		fmt.Printf("Failed to init embedded device apps: %v\n", err)
 		os.Exit(1)
 	}
 
-	appBin := appBins.Latest()
+	appBin := appBins.Current()
 
 	firmwares, err := NewFirmwares()
 	if err != nil {

cmd/tkey-verification/servesigner.go

@@ -38,7 +38,7 @@ func serveSigner(conf Config, devPath string, verbose bool, checkConfigOnly bool
 		os.Exit(1)
 	}
 
-	appBins, err := NewAppBins(latestAppHash)
+	appBins, err := NewAppBins(currentAppHash)
 	if err != nil {
 		fmt.Printf("Failed to init embedded device apps: %v\n", err)
 		os.Exit(1)

cmd/tkey-verification/util.go

@@ -28,13 +28,13 @@ func readBuildInfo() string {
 }
 
 func builtWith() {
-	appBins, err := NewAppBins(latestAppHash)
+	appBins, err := NewAppBins(currentAppHash)
 	if err != nil {
 		fmt.Printf("Failed to init embedded device apps: %v\n", err)
 		os.Exit(1)
 	}
 
-	deviceSignAppBin := appBins.Latest()
+	deviceSignAppBin := appBins.Current()
 
 	vendorKeys, err := NewVendorKeys(appBins, currentVendorHash)
 	if err != nil {

cmd/tkey-verification/verify.go

@@ -21,8 +21,7 @@ import (
 const verifyInfoURL = "https://www.tillitis.se/verify"
 
 func verify(devPath string, verbose bool, showURLOnly bool, baseDir string, verifyBaseURL string) {
-
-	appBins, err := NewAppBins(latestAppHash)
+	appBins, err := NewAppBins(currentAppHash)
 	if err != nil {
 		missing(fmt.Sprintf("no embedded device apps: %v", err))
 		os.Exit(1)