Merge pull request #3 from vchik795/bugfix/AN-1592

Verification of files notarized via /hashes entry-point supported
acronis · Mar 22, 2019 · 6f67493 · 6f67493
2 parents 51e90ed + d8a696c
commit 6f67493
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/main.go b/main.go
@@ -18,7 +18,7 @@ func main() {
 
 	app := cli.NewApp()
 	app.Name = "Verifyhash"
-	app.Version = "2.0"
+	app.Version = "2.1"
 	app.Compiled = time.Now()
 	app.Copyright = "(c) 2016 Acronis International GmbH"
 	app.Usage = "Acronis Notary verify hash CLI utility"

diff --git a/verify.go b/verify.go
@@ -41,9 +41,15 @@ func verifyMerkleProof(proof gomerkle.Proof, root, eTag string) error {
 		return errInvalidRoot
 	}
 
-	value := sha256.Sum256([]byte(eTag))
 	tree := gomerkle.NewTree(sha256.New())
-	valid := tree.VerifyProof(proof, rootByte, value[:])
+	eTagByte, _ := hex.DecodeString(eTag)
+	valid := tree.VerifyProof(proof, rootByte, eTagByte)
+	if valid {
+		return nil
+	}
+
+	value := sha256.Sum256([]byte(eTag))
+	valid = tree.VerifyProof(proof, rootByte, value[:])
 	if !valid {
 		return errors.New("Invalid proof or eTag")
 	}