Fix OS handling of version string (#232)

trusted_os/ctl.go

@@ -64,19 +64,11 @@ type controlInterface struct {
 }
 
 func getStatus() (s *api.Status) {
-	version, err := parseVersion(Version)
-	versionString := "unknown"
-	if err != nil {
-		log.Printf("failed to get version: %v", err)
-	} else {
-		versionString = version.String()
-	}
-
 	s = &api.Status{
 		SRKHash:  SRKHash,
 		Revision: Revision,
 		Build:    Build,
-		Version:  versionString,
+		Version:  osVersion.String(),
 		Runtime:  fmt.Sprintf("%s %s/%s", runtime.Version(), runtime.GOOS, runtime.GOARCH),
 		// TODO(jayhou): set IdentityCounter here.
 	}

trusted_os/main.go

@@ -135,6 +135,8 @@ func main() {
 	if imx6ul.Native && imx6ul.OCOTP != nil {
 		imx6ul.OCOTP.Timeout = 100 * time.Millisecond
 	}
+	// Strip off v from GitTag so we can semver parse it.
+	Version = strings.TrimPrefix(Version, "v")
 
 	var err error
 
@@ -195,7 +197,7 @@ func main() {
 		log.Fatalf("SM failed to create OS bundle verifier: %v", err)
 	}
 
-	if v, err := semver.NewVersion(strings.TrimPrefix(Version, "v")); err != nil {
+	if v, err := semver.NewVersion(Version); err != nil {
 		log.Printf("Failed to parse OS version %q: %v", Version, err)
 	} else {
 		osVersion = *v