Fix missing error check

usbarmory · Oct 5, 2021 · f1ca9b6 · f1ca9b6
1 parent b512099
commit f1ca9b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cmd/armory-drive-install/ft.go b/cmd/armory-drive-install/ft.go
@@ -69,7 +69,10 @@ func verifyRelease(release *github.RepositoryRelease, a *releaseAssets) (err err
 
 	if len(checkpoints) > 0 {
 		checkpoints = append(checkpoints, *newCP)
-		err = client.CheckConsistency(ctx, rfc6962.DefaultHasher, logFetcher, checkpoints)
+
+		if err = client.CheckConsistency(ctx, rfc6962.DefaultHasher, logFetcher, checkpoints); err != nil {
+			return
+		}
 	}
 
 	return verifyProof(a)

diff --git a/cmd/armory-drive-install/github.go b/cmd/armory-drive-install/github.go
@@ -133,7 +133,7 @@ func downloadRelease(version string) (a *releaseAssets, err error) {
 	log.Printf("\nDownloaded verified release assets")
 
 	if len(conf.frPublicKey) > 0 {
-		log.Printf("Using %s as manifest authentication key", conf.frPublicKey) 
+		log.Printf("Using %s as manifest authentication key", conf.frPublicKey)
 		a.frPub, err = os.ReadFile(conf.frPublicKey)
 	} else {
 		a.frPub, err = downloadKey("manifest authentication key", keysPath+frKeyName, client)
@@ -144,7 +144,7 @@ func downloadRelease(version string) (a *releaseAssets, err error) {
 	}
 
 	if len(conf.logPublicKey) > 0 {
-		log.Printf("Using %s as log authentication key", conf.logPublicKey) 
+		log.Printf("Using %s as log authentication key", conf.logPublicKey)
 		a.logPub, err = os.ReadFile(conf.logPublicKey)
 	} else {
 		a.logPub, err = downloadKey("transparency log authentication key", keysPath+logKeyName, client)